From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 21 Feb 2014 17:33:48 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2658
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1db8adce21f437333b3b24dcd923389636e84527;p=imagemagick

---

diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index 7bdc91681..322daad0f 100644
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -43,250 +43,6 @@ extern "C" {
 #include <crtdbg.h>
 #endif
 
-#define PROT_READ  0x01
-#define PROT_WRITE  0x02
-#define MAP_SHARED  0x01
-#define MAP_PRIVATE  0x02
-#define MAP_ANONYMOUS  0x20
-#define F_OK 0
-#define R_OK 4
-#define W_OK 2
-#define RW_OK 6
-#define _SC_PAGESIZE 1
-#define _SC_PHYS_PAGES 2
-#define _SC_OPEN_MAX 3
-#if !defined(SSIZE_MAX)
-#define SSIZE_MAX  0x7fffffffL
-#endif
-
-/*
-  _MSC_VER values:
-    1100 MSVC 5.0
-    1200 MSVC 6.0
-    1300 MSVC 7.0 Visual C++ .NET 2002
-    1310 Visual c++ .NET 2003
-    1400 Visual C++ 2005
-    1500 Visual C++ 2008
-*/
-
-#if !defined(chsize)
-# if defined(__BORLANDC__)
-#   define chsize(file,length)  chsize(file,length)
-# else
-#   define chsize(file,length)  _chsize(file,length)
-# endif
-#endif
-
-#if !defined(access)
-#if defined(_VISUALC_) && (_MSC_VER >= 1400)
-#  define access(path,mode)  _access_s(path,mode)
-#endif
-#endif
-#if !defined(chdir)
-#  define chdir  _chdir
-#endif
-#if !defined(close)
-#  define close  _close
-#endif
-#if !defined(closedir)
-#  define closedir(directory)  NTCloseDirectory(directory)
-#endif
-#if !defined(fdopen)
-#  define fdopen  _fdopen
-#endif
-#if !defined(fileno)
-#  define fileno  _fileno
-#endif
-#if !defined(fseek) && !defined(__MINGW32__) && !defined(__MINGW64__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define fseek  _fseeki64
-#endif
-#endif
-#if !defined(fstat) && !defined(__BORLANDC__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define fstat  _fstati64
-#else
-#  define fstat  _fstat
-#endif
-#endif
-#if !defined(fsync)
-#  define fsync  _commit
-#endif
-#if !defined(ftell) && !defined(__MINGW32__) && !defined(__MINGW64__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define ftell  _ftelli64
-#endif
-#endif
-#if !defined(ftruncate)
-#  define ftruncate(file,length)  NTTruncateFile(file,length)
-#endif
-#if !defined(getcwd)
-#  define getcwd  _getcwd
-#endif
-#if !defined(getpid)
-#  define getpid  _getpid
-#endif
-#if !defined(hypot)
-#  define hypot  _hypot
-#endif
-#if !defined(inline)
-#  define inline __inline
-#endif
-#if !defined(isatty)
-#  define isatty  _isatty
-#endif
-#if !defined(locale_t)
-#define locale_t _locale_t
-#endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define lseek  _lseeki64
-#else
-#  define lseek  _lseek
-#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_dlexit)
-#  define lt_dlexit()  NTExitLibrary()
-#endif
-#if !defined(lt_dlinit)
-#  define lt_dlinit()  NTInitializeLibrary()
-#endif
-#if !defined(lt_dlopen)
-#  define lt_dlopen(filename)  NTOpenLibrary(filename)
-#endif
-#if !defined(lt_dlsetsearchpath)
-#  define lt_dlsetsearchpath(path)  NTSetSearchPath(path)
-#endif
-#if !defined(lt_dlsym)
-#  define lt_dlsym(handle,name)  NTGetLibrarySymbol(handle,name)
-#endif
-#endif
-#if !defined(mkdir)
-#  define mkdir  _mkdir
-#endif
-#if !defined(mmap)
-#  define mmap(address,length,protection,access,file,offset) \
-  NTMapMemory(address,length,protection,access,file,offset)
-#endif
-#if !defined(msync)
-#  define msync(address,length,flags)  NTSyncMemory(address,length,flags)
-#endif
-#if !defined(munmap)
-#  define munmap(address,length)  NTUnmapMemory(address,length)
-#endif
-#if !defined(opendir)
-#  define opendir(directory)  NTOpenDirectory(directory)
-#endif
-#if !defined(open)
-#  define open  _open
-#endif
-#if !defined(pclose)
-#  define pclose  _pclose
-#endif
-#if !defined(popen)
-#  define popen  _popen
-#endif
-#if !defined(fprintf_l)
-#define fprintf_l  _fprintf_s_l
-#endif
-#if !defined(read)
-#  define read  _read
-#endif
-#if !defined(readdir)
-#  define readdir(directory)  NTReadDirectory(directory)
-#endif
-#if !defined(seekdir)
-#  define seekdir(directory,offset)  NTSeekDirectory(directory,offset)
-#endif
-#if !defined(setmode)
-#  define setmode  _setmode
-#endif
-#if !defined(spawnvp)
-#  define spawnvp  _spawnvp
-#endif
-#if !defined(strtod_l)
-#define strtod_l  _strtod_l
-#endif
-#if !defined(stat) && !defined(__BORLANDC__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define stat  _stati64
-#else
-#  define stat  _stat
-#endif
-#endif
-#if !defined(strcasecmp)
-#  define strcasecmp  _stricmp
-#endif
-#if !defined(strncasecmp)
-#  define strncasecmp  _strnicmp
-#endif
-#if !defined(sysconf)
-#  define sysconf(name)  NTSystemConfiguration(name)
-#endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define tell  _telli64
-#else
-#  define tell  _tell
-#endif
-#if !defined(telldir)
-#  define telldir(directory)  NTTellDirectory(directory)
-#endif
-#if !defined(tempnam)
-#  define tempnam  _tempnam_s
-#endif
-#if !defined(vfprintf_l)
-#define vfprintf_l  _vfprintf_l
-#endif
-#if !defined(vsnprintf)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1500)
-#define vsnprintf _vsnprintf 
-#endif
-#endif
-#if !defined(vsnprintf_l)
-#define vsnprintf_l  _vsnprintf_l
-#endif
-#if !defined(write)
-#  define write  _write
-#endif
-#if !defined(wstat) && !defined(__BORLANDC__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define wstat  _wstati64
-#else
-#  define wstat  _wstat
-#endif
-#endif
-
-#if defined(_MT) && defined(MAGICKCORE_WINDOWS_SUPPORT)
-#  define SAFE_GLOBAL  __declspec(thread)
-#else
-#  define SAFE_GLOBAL
-#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
-
 #if !defined(XS_VERSION)
 struct dirent
 {
diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 041ebe052..4eaeafb4d 100644
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -26,6 +26,251 @@ extern "C" {
 #endif
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
+
+#define PROT_READ  0x01
+#define PROT_WRITE  0x02
+#define MAP_SHARED  0x01
+#define MAP_PRIVATE  0x02
+#define MAP_ANONYMOUS  0x20
+#define F_OK 0
+#define R_OK 4
+#define W_OK 2
+#define RW_OK 6
+#define _SC_PAGESIZE 1
+#define _SC_PHYS_PAGES 2
+#define _SC_OPEN_MAX 3
+#if !defined(SSIZE_MAX)
+#define SSIZE_MAX  0x7fffffffL
+#endif
+
+/*
+  _MSC_VER values:
+    1100 MSVC 5.0
+    1200 MSVC 6.0
+    1300 MSVC 7.0 Visual C++ .NET 2002
+    1310 Visual c++ .NET 2003
+    1400 Visual C++ 2005
+    1500 Visual C++ 2008
+*/
+
+#if !defined(chsize)
+# if defined(__BORLANDC__)
+#   define chsize(file,length)  chsize(file,length)
+# else
+#   define chsize(file,length)  _chsize(file,length)
+# endif
+#endif
+
+#if !defined(access)
+#if defined(_VISUALC_) && (_MSC_VER >= 1400)
+#  define access(path,mode)  _access_s(path,mode)
+#endif
+#endif
+#if !defined(chdir)
+#  define chdir  _chdir
+#endif
+#if !defined(close)
+#  define close  _close
+#endif
+#if !defined(closedir)
+#  define closedir(directory)  NTCloseDirectory(directory)
+#endif
+#if !defined(fdopen)
+#  define fdopen  _fdopen
+#endif
+#if !defined(fileno)
+#  define fileno  _fileno
+#endif
+#if !defined(fseek) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define fseek  _fseeki64
+#endif
+#endif
+#if !defined(fstat) && !defined(__BORLANDC__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define fstat  _fstati64
+#else
+#  define fstat  _fstat
+#endif
+#endif
+#if !defined(fsync)
+#  define fsync  _commit
+#endif
+#if !defined(ftell) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define ftell  _ftelli64
+#endif
+#endif
+#if !defined(ftruncate)
+#  define ftruncate(file,length)  NTTruncateFile(file,length)
+#endif
+#if !defined(getcwd)
+#  define getcwd  _getcwd
+#endif
+#if !defined(getpid)
+#  define getpid  _getpid
+#endif
+#if !defined(hypot)
+#  define hypot  _hypot
+#endif
+#if !defined(inline)
+#  define inline __inline
+#endif
+#if !defined(isatty)
+#  define isatty  _isatty
+#endif
+#if !defined(locale_t)
+#define locale_t _locale_t
+#endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define lseek  _lseeki64
+#else
+#  define lseek  _lseek
+#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_dlexit)
+#  define lt_dlexit()  NTExitLibrary()
+#endif
+#if !defined(lt_dlinit)
+#  define lt_dlinit()  NTInitializeLibrary()
+#endif
+#if !defined(lt_dlopen)
+#  define lt_dlopen(filename)  NTOpenLibrary(filename)
+#endif
+#if !defined(lt_dlsetsearchpath)
+#  define lt_dlsetsearchpath(path)  NTSetSearchPath(path)
+#endif
+#if !defined(lt_dlsym)
+#  define lt_dlsym(handle,name)  NTGetLibrarySymbol(handle,name)
+#endif
+#endif
+#if !defined(mkdir)
+#  define mkdir  _mkdir
+#endif
+#if !defined(mmap)
+#  define mmap(address,length,protection,access,file,offset) \
+  NTMapMemory(address,length,protection,access,file,offset)
+#endif
+#if !defined(msync)
+#  define msync(address,length,flags)  NTSyncMemory(address,length,flags)
+#endif
+#if !defined(munmap)
+#  define munmap(address,length)  NTUnmapMemory(address,length)
+#endif
+#if !defined(opendir)
+#  define opendir(directory)  NTOpenDirectory(directory)
+#endif
+#if !defined(open)
+#  define open  _open
+#endif
+#if !defined(pclose)
+#  define pclose  _pclose
+#endif
+#if !defined(popen)
+#  define popen  _popen
+#endif
+#if !defined(fprintf_l)
+#define fprintf_l  _fprintf_s_l
+#endif
+#if !defined(read)
+#  define read  _read
+#endif
+#if !defined(readdir)
+#  define readdir(directory)  NTReadDirectory(directory)
+#endif
+#if !defined(seekdir)
+#  define seekdir(directory,offset)  NTSeekDirectory(directory,offset)
+#endif
+#if !defined(setmode)
+#  define setmode  _setmode
+#endif
+#if !defined(spawnvp)
+#  define spawnvp  _spawnvp
+#endif
+#if !defined(strtod_l)
+#define strtod_l  _strtod_l
+#endif
+#if !defined(stat) && !defined(__BORLANDC__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define stat  _stati64
+#else
+#  define stat  _stat
+#endif
+#endif
+#if !defined(strcasecmp)
+#  define strcasecmp  _stricmp
+#endif
+#if !defined(strncasecmp)
+#  define strncasecmp  _strnicmp
+#endif
+#if !defined(sysconf)
+#  define sysconf(name)  NTSystemConfiguration(name)
+#endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define tell  _telli64
+#else
+#  define tell  _tell
+#endif
+#if !defined(telldir)
+#  define telldir(directory)  NTTellDirectory(directory)
+#endif
+#if !defined(tempnam)
+#  define tempnam  _tempnam_s
+#endif
+#if !defined(vfprintf_l)
+#define vfprintf_l  _vfprintf_l
+#endif
+#if !defined(vsnprintf)
+#if !defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1500)
+#define vsnprintf _vsnprintf 
+#endif
+#endif
+#if !defined(vsnprintf_l)
+#define vsnprintf_l  _vsnprintf_l
+#endif
+#if !defined(write)
+#  define write  _write
+#endif
+#if !defined(wstat) && !defined(__BORLANDC__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
+#  define wstat  _wstati64
+#else
+#  define wstat  _wstat
+#endif
+#endif
+
+#if defined(_MT) && defined(MAGICKCORE_WINDOWS_SUPPORT)
+#  define SAFE_GLOBAL  __declspec(thread)
+#else
+#  define SAFE_GLOBAL
+#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
   GhostInfo_;