Moved blob specific defines for the Windows build to blob.c

ImageMagick · Apr 27, 2024 · a4c84b6 · a4c84b6
1 parent d98a6dc
commit a4c84b6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/MagickCore/blob.c b/MagickCore/blob.c
@@ -93,6 +93,25 @@
 #include <io.h>
 #define _O_BINARY O_BINARY
 #endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#  if !defined(fsync)
+#    define fsync  _commit
+#  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(pclose)
+#    define pclose  _pclose
+#  endif
+#  if !defined(popen)
+#    define popen  _popen
+#  endif
+#endif
 
 /*
   Typedef declarations.

diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
@@ -33,9 +33,6 @@ extern "C" {
 #if !defined(closedir)
 #  define closedir(directory)  NTCloseDirectory(directory)
 #endif
-#if !defined(fsync)
-#  define fsync  _commit
-#endif
 #if !defined(MAGICKCORE_LTDL_DELEGATE)
 #if !defined(lt_dlclose)
 #  define lt_dlclose(handle)  NTCloseLibrary(handle)
@@ -50,23 +47,9 @@ extern "C" {
 #  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