From eef9934798d23635e34312d71170b63a67c1bab4 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Wed, 6 Nov 2024 07:31:50 +0100 Subject: [PATCH] Removed __BORLANDC__ checks. --- magick/method-attribute.h | 2 +- magick/nt-base.c | 2 +- magick/nt-base.h | 23 ++++------------------- wand/method-attribute.h | 2 +- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/magick/method-attribute.h b/magick/method-attribute.h index 4b0954786..b1e369639 100644 --- a/magick/method-attribute.h +++ b/magick/method-attribute.h @@ -22,7 +22,7 @@ extern "C" { #endif -#if defined(__BORLANDC__) && defined(_DLL) +#if defined(_DLL) # define _MAGICKDLL_ # define _MAGICKLIB_ # define MAGICKCORE_MODULES_SUPPORT diff --git a/magick/nt-base.c b/magick/nt-base.c index bfbd2301a..a1d286e75 100644 --- a/magick/nt-base.c +++ b/magick/nt-base.c @@ -2621,7 +2621,7 @@ MagickPrivate void NTWindowsGenesis(void) (void) SetErrorMode(StringToInteger(mode)); mode=DestroyString(mode); } -#if defined(_DEBUG) && !defined(__BORLANDC__) && !defined(__MINGW32__) +#if defined(_DEBUG) && !defined(__MINGW32__) if (IsEventLogging() != MagickFalse) { int diff --git a/magick/nt-base.h b/magick/nt-base.h index 841baaaf7..251944da0 100644 --- a/magick/nt-base.h +++ b/magick/nt-base.h @@ -69,11 +69,7 @@ extern "C" { #endif #if !defined(chsize) -# if defined(__BORLANDC__) -# define chsize(file,length) chsize(file,length) -# else -# define chsize(file,length) _chsize(file,length) -# endif +# define chsize(file,length) _chsize(file,length) #endif #if !defined(access) @@ -106,7 +102,7 @@ extern "C" { # define fseek _fseeki64 #endif #endif -#if !defined(fstat) && !defined(__BORLANDC__) +#if !defined(fstat) #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && \ !(defined(__MSVCRT_VERSION__) && (__MSVCRT_VERSION__ < 0x800)) @@ -224,7 +220,7 @@ extern "C" { #if !defined(strtod_l) #define strtod_l _strtod_l #endif -#if !defined(stat) && !defined(__BORLANDC__) +#if !defined(stat) #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && \ !(defined(__MSVCRT_VERSION__) && (__MSVCRT_VERSION__ < 0x800)) @@ -282,7 +278,7 @@ extern "C" { #if !defined(write) # define write(fd,buffer,count) _write(fd,buffer,(unsigned int) count) #endif -#if !defined(wstat) && !defined(__BORLANDC__) +#if !defined(wstat) #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && \ !(defined(__MSVCRT_VERSION__) && (__MSVCRT_VERSION__ < 0x800)) @@ -292,17 +288,6 @@ extern "C" { #endif #endif -#if defined(__BORLANDC__) -#undef _O_RANDOM -#define _O_RANDOM 0 -#undef _O_SEQUENTIAL -#define _O_SEQUENTIAL 0 -#undef _O_SHORT_LIVED -#define _O_SHORT_LIVED 0 -#undef _O_TEMPORARY -#define _O_TEMPORARY 0 -#endif - #undef gettimeofday typedef struct _GhostInfo diff --git a/wand/method-attribute.h b/wand/method-attribute.h index 0631d6622..8790d1107 100644 --- a/wand/method-attribute.h +++ b/wand/method-attribute.h @@ -22,7 +22,7 @@ extern "C" { #endif -#if defined(__BORLANDC__) && defined(_DLL) +#if defined(_DLL) # define _MAGICKDLL_ # define _MAGICKLIB_ # define MAGICKCORE_MODULES_SUPPORT