(no commit message)

[imagemagick] / MagickCore / nt-base.h

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 39d980fc925ae6fe5a7706498a779d529fc7e449..87ead52d3bc7e1d026f5f2272c5c38f94ae03330 100644 (file)
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -1,12 +1,12 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
-
+  
   You may not use this file except in compliance with the License.
   obtain a copy of the License at
-
+  
     http://www.imagemagick.org/script/license.php
-
+  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,13 +18,14 @@
 #ifndef _MAGICKCORE_NT_BASE_H
 #define _MAGICKCORE_NT_BASE_H
 
+#include "MagickCore/exception.h"
+#include "MagickCore/geometry.h"
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include "MagickCore/delegate.h"
-#include "MagickCore/delegate-private.h"
-#include "MagickCore/exception.h"
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN
@@ -36,7 +37,8 @@ extern "C" {
 #include <io.h>
 #include <process.h>
 #include <errno.h>
-#if defined(_DEBUG) && !defined(__MINGW32__)
+#include <malloc.h>
+#if defined(_DEBUG) && !defined(__MINGW32__) && !defined(__MINGW64__)
 #include <crtdbg.h>
 #endif
 
@@ -94,7 +96,7 @@ extern "C" {
 #if !defined(fileno)
 #  define fileno  _fileno
 #endif
-#if !defined(fseek) && !defined(__MINGW32__)
+#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
@@ -111,7 +113,7 @@ extern "C" {
 #if !defined(fsync)
 #  define fsync  _commit
 #endif
-#if !defined(ftell) && !defined(__MINGW32__)
+#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
@@ -133,7 +135,7 @@ extern "C" {
 #  define inline __inline
 #endif
 #if !defined(isatty)
-#  define isatty _isatty
+#  define isatty  _isatty
 #endif
 #if !defined(locale_t)
 #define locale_t _locale_t
@@ -222,7 +224,7 @@ extern "C" {
 #endif
 #endif
 #if !defined(strcasecmp)
-#  define strcasecmp  _strcmpi
+#  define strcasecmp  _stricmp
 #endif
 #if !defined(strncasecmp)
 #  define strncasecmp  _strnicmp
@@ -265,12 +267,6 @@ extern "C" {
 #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
@@ -282,145 +278,27 @@ extern "C" {
 #define _O_TEMPORARY 0
 #endif
 
-#if !defined(XS_VERSION)
-struct dirent
-{
-  char
-    d_name[2048];
-
-  int
-    d_namlen;
-};
-
-typedef struct _DIR
-{
-  HANDLE
-    hSearch;
-
-  WIN32_FIND_DATA
-    Win32FindData;
-
-  BOOL
-    firsttime;
-
-  struct dirent
-    file_info;
-} DIR;
-
-typedef struct _NTMEMORYSTATUSEX
-{
-  DWORD
-    dwLength,
-    dwMemoryLoad;
-
-  DWORDLONG
-    ullTotalPhys,
-    ullAvailPhys,
-    ullTotalPageFile,
-    ullAvailPageFile,
-    ullTotalVirtual,
-    ullAvailVirtual,
-    ullAvailExtendedVirtual;
-} NTMEMORYSTATUSEX;
-
-#if !defined(__MINGW32__)
-struct timezone
-{
-  int
-    tz_minuteswest,
-    tz_dsttime;
-};
-#endif
-
-typedef UINT
-  (CALLBACK *LPFNDLLFUNC1)(DWORD,UINT);
+#undef gettimeofday
 
-typedef UINT
-  (CALLBACK *LPFNDLLFUNC2)(NTMEMORYSTATUSEX *);
-
-#endif
-
-#if defined(MAGICKCORE_BZLIB_DELEGATE)
-#  if defined(_WIN32)
-#    define BZ_IMPORT 1
-#  endif
-#endif
+typedef struct _GhostInfo
+  GhostInfo_;
 
 extern MagickExport char
-  *NTGetLastError(void),
   **NTArgvToUTF8(const int argc,wchar_t **);
 
-extern MagickExport const GhostInfo
+extern MagickExport const GhostInfo_
   *NTGhostscriptDLLVectors(void);
 
-#if !defined(MAGICKCORE_LTDL_DELEGATE)
-extern MagickExport const char
-  *NTGetLibraryError(void);
-#endif
-
-#if !defined(XS_VERSION)
-extern MagickExport const char
-  *NTGetLibraryError(void);
-
-extern MagickExport DIR
-  *NTOpenDirectory(const char *);
-
-extern MagickExport double
-  NTElapsedTime(void),
-  NTUserTime(void);
-
 extern MagickExport int
-  Exit(int),
-#if !defined(__MINGW32__)
-  gettimeofday(struct timeval *,struct timezone *),
-#endif
-  IsWindows95(),
-  NTCloseDirectory(DIR *),
-  NTCloseLibrary(void *),
-  NTControlHandler(void),
-  NTExitLibrary(void),
-  NTTruncateFile(int,off_t),
-  NTGhostscriptDLL(char *,int),
-  NTGhostscriptEXE(char *,int),
-  NTGhostscriptFonts(char *,int),
-  NTGhostscriptLoadDLL(void),
-  NTGhostscriptUnLoadDLL(void),
-  NTInitializeLibrary(void),
-  NTSetSearchPath(const char *),
-  NTSyncMemory(void *,size_t,int),
-  NTUnmapMemory(void *,size_t),
-  NTSystemCommand(const char *);
-
-extern MagickExport ssize_t
-  NTSystemConfiguration(int),
-  NTTellDirectory(DIR *);
-
-extern MagickExport MagickBooleanType
-  NTGatherRandomData(const size_t,unsigned char *),
-  NTGetExecutionPath(char *,const size_t),
-  NTGetModulePath(const char *,char *),
-  NTReportEvent(const char *,const MagickBooleanType),
-  NTReportException(const char *,const MagickBooleanType);
-
-extern MagickExport struct dirent
-  *NTReadDirectory(DIR *);
-
-extern MagickExport unsigned char
-  *NTRegistryKeyLookup(const char *),
-  *NTResourceToBlob(const char *);
+  NTGhostscriptUnLoadDLL(void);
 
 extern MagickExport void
   NTErrorHandler(const ExceptionType,const char *,const char *),
-  *NTGetLibrarySymbol(void *,const char *),
-  *NTMapMemory(char *,size_t,int,int,int,MagickOffsetType),
-  *NTOpenLibrary(const char *),
-  NTSeekDirectory(DIR *,ssize_t),
   NTWarningHandler(const ExceptionType,const char *,const char *);
-
-#endif /* !XS_VERSION */
+#endif
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
-#endif /* !C++ */
+#endif
 
-#endif /* !_MAGICKCORE_NT_BASE_H */
+#endif