From 625f7beeeab8f2fd512fc14f9ec16f0a6f7465ab Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Fri, 26 Apr 2024 17:19:30 +0200 Subject: [PATCH] Moved defines that are only used by our windows build to the private header file. --- MagickCore/blob-private.h | 6 ++- MagickCore/feature.c | 1 + MagickCore/matrix.c | 1 + MagickCore/nt-base-private.h | 73 ++++++++++++++++++++++++++++++++ MagickCore/nt-base.h | 80 ------------------------------------ MagickCore/studio.h | 1 + 6 files changed, 81 insertions(+), 81 deletions(-) diff --git a/MagickCore/blob-private.h b/MagickCore/blob-private.h index e6bce7be2c..3f8482c3ba 100644 --- a/MagickCore/blob-private.h +++ b/MagickCore/blob-private.h @@ -20,7 +20,6 @@ #include "MagickCore/image.h" #include "MagickCore/stream.h" -#include "MagickCore/nt-base-private.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { @@ -31,6 +30,11 @@ extern "C" { # define fseek fseeko # define ftell ftello #endif +#if defined(MAGICKCORE_WINDOWS_SUPPORT) +#if !defined(__MINGW32__) +# define stat _stati64 +#endif +#endif typedef enum { diff --git a/MagickCore/feature.c b/MagickCore/feature.c index e873e48e19..c8c0620566 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -76,6 +76,7 @@ #include "MagickCore/monitor.h" #include "MagickCore/monitor-private.h" #include "MagickCore/morphology-private.h" +#include "MagickCore/nt-base-private.h" #include "MagickCore/option.h" #include "MagickCore/paint.h" #include "MagickCore/pixel-accessor.h" diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c index 8f14eb5ecc..c171c68631 100644 --- a/MagickCore/matrix.c +++ b/MagickCore/matrix.c @@ -49,6 +49,7 @@ #include "MagickCore/matrix.h" #include "MagickCore/matrix-private.h" #include "MagickCore/memory_.h" +#include "MagickCore/nt-base-private.h" #include "MagickCore/pixel-accessor.h" #include "MagickCore/resource_.h" #include "MagickCore/semaphore.h" diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h index da049ddd55..65bf909c05 100644 --- a/MagickCore/nt-base-private.h +++ b/MagickCore/nt-base-private.h @@ -30,6 +30,79 @@ extern "C" { #if defined(MAGICKCORE_WINDOWS_SUPPORT) +#if !defined(closedir) +# define closedir(directory) NTCloseDirectory(directory) +#endif +#if !defined(freelocale) +# define freelocale _free_locale +#endif +#if !defined(fsync) +# define fsync _commit +#endif +#if !defined(locale_t) +#define locale_t _locale_t +#endif +#if !defined(MAGICKCORE_LTDL_DELEGATE) +#if !defined(lt_dlclose) +# define lt_dlclose(handle) NTCloseLibrary(handle) +#endif +#if !defined(lt_dlerror) +# define lt_dlerror() NTGetLibraryError() +#endif +#if !defined(lt_dlopen) +# define lt_dlopen(filename) NTOpenLibrary(filename) +#endif +#if !defined(lt_dlsym) +# define lt_dlsym(handle,name) NTGetLibrarySymbol(handle,name) +#endif +#endif +#if !defined(mmap) +# define MAGICKCORE_HAVE_MMAP 1 +# define mmap(address,length,protection,access,file,offset) \ + NTMapMemory(address,length,protection,access,file,offset) +#endif +#if !defined(munmap) +# define munmap(address,length) NTUnmapMemory(address,length) +#endif +#if !defined(opendir) +# define opendir(directory) NTOpenDirectory(directory) +#endif +#if !defined(pclose) +# define pclose _pclose +#endif +#if !defined(popen) +# define popen _popen +#endif +#if !defined(read) +# define read(fd,buffer,count) _read(fd,buffer,(unsigned int) count) +#endif +#if !defined(readdir) +# define readdir(directory) NTReadDirectory(directory) +#endif +#if !defined(strtod_l) +#define strtod_l _strtod_l +#endif +#if !defined(strcasecmp) +# define strcasecmp _stricmp +#endif +#if !defined(sysconf) +# define sysconf(name) NTSystemConfiguration(name) +# define MAGICKCORE_HAVE_SYSCONF 1 +#endif +#if !defined(vfprintf_l) +#define vfprintf_l _vfprintf_l +#endif +#if !defined(vsnprintf_l) +#define vsnprintf_l _vsnprintf_l +#endif +#if !defined(write) +# define write(fd,buffer,count) _write(fd,buffer,(unsigned int) count) +#endif +#if !defined(__MINGW32__) +# define fstat _fstati64 +# define stat _stati64 +#endif + #if !defined(XS_VERSION) struct dirent { diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h index 6f6c00c7d8..6c0ac454e3 100644 --- a/MagickCore/nt-base.h +++ b/MagickCore/nt-base.h @@ -82,86 +82,6 @@ extern "C" { # endif #endif -#if !defined(closedir) -# define closedir(directory) NTCloseDirectory(directory) -#endif -#if !defined(freelocale) -# define freelocale _free_locale -#endif -#if !defined(fsync) -# define fsync _commit -#endif -#if !defined(locale_t) -#define locale_t _locale_t -#endif -#if !defined(MAGICKCORE_LTDL_DELEGATE) -#if !defined(lt_dlclose) -# define lt_dlclose(handle) NTCloseLibrary(handle) -#endif -#if !defined(lt_dlerror) -# define lt_dlerror() NTGetLibraryError() -#endif -#if !defined(lt_dlopen) -# define lt_dlopen(filename) NTOpenLibrary(filename) -#endif -#if !defined(lt_dlsym) -# define lt_dlsym(handle,name) NTGetLibrarySymbol(handle,name) -#endif -#endif -#if !defined(mmap) -# define MAGICKCORE_HAVE_MMAP 1 -# define mmap(address,length,protection,access,file,offset) \ - NTMapMemory(address,length,protection,access,file,offset) -#endif -#if !defined(munmap) -# define munmap(address,length) NTUnmapMemory(address,length) -#endif -#if !defined(opendir) -# define opendir(directory) NTOpenDirectory(directory) -#endif -#if !defined(pclose) -# define pclose _pclose -#endif -#if !defined(popen) -# define popen _popen -#endif -#if !defined(read) -# define read(fd,buffer,count) _read(fd,buffer,(unsigned int) count) -#endif -#if !defined(readdir) -# define readdir(directory) NTReadDirectory(directory) -#endif -#if !defined(strtod_l) -#define strtod_l _strtod_l -#endif -#if !defined(strcasecmp) -# define strcasecmp _stricmp -#endif -#if !defined(strncasecmp) -# define strncasecmp _strnicmp -#endif -#if !defined(sysconf) -# define sysconf(name) NTSystemConfiguration(name) -# define MAGICKCORE_HAVE_SYSCONF 1 -#endif -#if !defined(vfprintf_l) -#define vfprintf_l _vfprintf_l -#endif -#if !defined(vsnprintf_l) -#define vsnprintf_l _vsnprintf_l -#endif -#if !defined(write) -# define write(fd,buffer,count) _write(fd,buffer,(unsigned int) count) -#endif -#if !defined(__MINGW32__) -# if !defined(fstat) -# define fstat _fstati64 -# endif -# if !defined(stat) -# define stat _stati64 -# endif -#endif - #if defined(__BORLANDC__) #undef _O_RANDOM #define _O_RANDOM 0 diff --git a/MagickCore/studio.h b/MagickCore/studio.h index faddd44ad3..ebad26eaf9 100644 --- a/MagickCore/studio.h +++ b/MagickCore/studio.h @@ -102,6 +102,7 @@ extern "C" { #define _CRTDBG_MAP_ALLOC #endif #if defined(MAGICKCORE_WINDOWS_SUPPORT) +# define NOMINMAX # include #if !defined(__CYGWIN__) # include