Removed checks for __MINGW64__ because we only need to check for __MINGW32__.

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index b2ab89b0ed907fbbee11b14b35f44af607da1006..2dd92af5cf2dfdcd6ebdd5efc388ff184dfec945 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -83,7 +83,7 @@
 #include "MagickCore/xwindow.h"
 #include "MagickCore/xwindow-private.h"
 #if defined(MAGICKCORE_FREETYPE_DELEGATE)
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(__MINGW32__)
 #  undef interface
 #endif
 #include <ft2build.h>

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 256bba1be853c1aa9e1823236372f99f3012a4d7..e9ddcf40f0170993ee9992859a485e3a4918c0de 100644 (file)
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -87,7 +87,7 @@
 #define SOCKET_TYPE int
 #define LENGTH_TYPE size_t
 #define MAGICKCORE_HAVE_DISTRIBUTE_CACHE
-#elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 #define CHAR_TYPE_CAST (char *)
 #define CLOSE_SOCKET(socket) (void) closesocket(socket)
 #define HANDLER_RETURN_TYPE DWORD WINAPI

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 43215279d726844d8ab48ebd0ef9ecfae3feab95..1dd2714c89a43a3528bfd2cbe680bcfe7c5b3b59 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -142,7 +142,7 @@ extern "C" {
 #  define MAGICKCORE_PATH_SEPARATOR            ":"
 #endif /* !DIR_SEPARATOR_CHAR */
 
-# if defined(MAGICKCORE_POSIX_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
+# if defined(MAGICKCORE_POSIX_SUPPORT) || defined(__MINGW32__)
  
 /* module dir */
 #ifndef MAGICKCORE_MODULES_DIRNAME

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index 12dc098813fd86677406dcfcab55ee720abd6306..3af92d56a539cde023a19205433a520101cdc04c 100644 (file)
--- a/MagickCore/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -28,7 +28,7 @@ extern "C" {
 #define MAGICKCORE_QUANTUM_DEPTH  16
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 #  define MagickLLConstant(c)  (MagickOffsetType) (c ## i64)
 #  define MagickULLConstant(c)  (MagickSizeType) (c ## ui64)
 #else

diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index a42565284f4b506a87e154e6746f2855727c9eb3..292e97efbea96114a9266573b4279b49fbd9ce7f 100644 (file)
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -70,7 +70,7 @@ typedef struct _NTMEMORYSTATUSEX
     ullAvailExtendedVirtual;
 } NTMEMORYSTATUSEX;
 
-#if !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(__MINGW32__)
 struct timeval;
 
 struct timezone
@@ -117,7 +117,7 @@ extern MagickPrivate double
 
 extern MagickPrivate int
   Exit(int),
-#if !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(__MINGW32__)
   gettimeofday(struct timeval *,struct timezone *),
 #endif
   IsWindows95(void),

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index d493ceabdfd781a2797fd6baa60ead75f183ccdd..c489fd325bfc2b83ef556b6022571851fb501c7f 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -351,7 +351,7 @@ MagickPrivate int Exit(int status)
   exit(status);
 }
 \f
-#if !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(__MINGW32__)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -2794,7 +2794,7 @@ MagickPrivate void NTWindowsGenesis(void)
       (void) SetErrorMode(StringToInteger(mode));
       mode=DestroyString(mode);
     }
-#if defined(_DEBUG) && !defined(__BORLANDC__) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(_DEBUG) && !defined(__BORLANDC__) && !defined(__MINGW32__)
   if (IsEventLogging() != MagickFalse)
     {
       int

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 518c45b563bae68ea483bad82115b83c32a6283a..2d1bc2b58e34649d06122c38c408fe64cc0f547b 100644 (file)
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -39,7 +39,7 @@ extern "C" {
 #include <errno.h>
 #include <malloc.h>
 #include <sys/utime.h>
-#if defined(_DEBUG) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(_DEBUG) && !defined(__MINGW32__)
 #include <crtdbg.h>
 #endif
 
@@ -105,7 +105,7 @@ extern "C" {
 #if !defined(fileno)
 #  define fileno  _fileno
 #endif
-#if !defined(fseek) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(fseek) && !defined(__MINGW32__)
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
   !(defined(_MSC_VER) && (_MSC_VER < 1400)) && \
   !(defined(__MSVCRT_VERSION__) && (__MSVCRT_VERSION__ < 0x800))
@@ -124,7 +124,7 @@ extern "C" {
 #if !defined(fsync)
 #  define fsync  _commit
 #endif
-#if !defined(ftell) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if !defined(ftell) && !defined(__MINGW32__)
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
   !(defined(_MSC_VER) && (_MSC_VER < 1400)) && \
   !(defined(__MSVCRT_VERSION__) && (__MSVCRT_VERSION__ < 0x800))

diff --git a/MagickCore/random.c b/MagickCore/random.c
index e6bc0bcadff70ed85e7d5b47eb1aaf481cb823b3..644b753aea97d3c4c8c0843a9498f61eaf1dc4f2 100644 (file)
--- a/MagickCore/random.c
+++ b/MagickCore/random.c
@@ -44,7 +44,7 @@
 #if defined(__VMS)
 #include <time.h>
 #endif
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(__MINGW32__)
 #include <sys/time.h>
 #endif
 #include "MagickCore/studio.h"

diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
index 00ad18d4f05b59da53599a33f226e2e57cbc0646..321939a0ca9f7362a89817834576164b6b7a35a8 100644 (file)
--- a/MagickCore/utility-private.h
+++ b/MagickCore/utility-private.h
@@ -127,7 +127,7 @@ static inline int access_utf8(const char *path,int mode)
 
 static inline FILE *fopen_utf8(const char *path,const char *mode)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   return(fopen(path,mode));
 #else
    FILE
@@ -155,7 +155,7 @@ static inline FILE *fopen_utf8(const char *path,const char *mode)
 
 static inline void getcwd_utf8(char *path,size_t extent)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   char
     *directory;
 
@@ -170,14 +170,14 @@ static inline void getcwd_utf8(char *path,size_t extent)
 #endif
 }
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
 typedef int
   mode_t;
 #endif
 
 static inline int open_utf8(const char *path,int flags,mode_t mode)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   return(open(path,flags,mode));
 #else
    int
@@ -197,7 +197,7 @@ static inline int open_utf8(const char *path,int flags,mode_t mode)
 
 static inline FILE *popen_utf8(const char *command,const char *type)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   return(popen(command,type));
 #else
    FILE
@@ -225,7 +225,7 @@ static inline FILE *popen_utf8(const char *command,const char *type)
 
 static inline int remove_utf8(const char *path)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   return(unlink(path));
 #else
    int
@@ -245,7 +245,7 @@ static inline int remove_utf8(const char *path)
 
 static inline int rename_utf8(const char *source,const char *destination)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   return(rename(source,destination));
 #else
    int
@@ -273,7 +273,7 @@ static inline int rename_utf8(const char *source,const char *destination)
 
 static inline int stat_utf8(const char *path,struct stat *attributes)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
   return(stat(path,attributes));
 #else
    int

diff --git a/coders/bmp.c b/coders/bmp.c
index 7a9e9cbca9feac15df5dec50a7b8a7416a6808ae..69cd078c88a80d6996a492cc2b345d535081cc62 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -75,7 +75,7 @@
 #define BI_JPEG  4
 #undef BI_PNG
 #define BI_PNG  5
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
 #undef BI_RGB
 #define BI_RGB  0
 #undef BI_RLE8

diff --git a/coders/dib.c b/coders/dib.c
index 111b883ca7763c93afe99c80a242e115d15dfb68..8df4cbc66c8b8dfe40ed05fd1b6da275b444eea4 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -146,7 +146,7 @@ static MagickBooleanType
 static MagickBooleanType DecodeImage(Image *image,
   const MagickBooleanType compression,unsigned char *pixels)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
 #define BI_RGB  0
 #define BI_RLE8  1
 #define BI_RLE4  2

diff --git a/coders/icon.c b/coders/icon.c
index 0cd79140b38e57386fb124090481567991946711..0051c15a479f72c0b779707765c9b2779667f85a 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -69,7 +69,7 @@
 /*
   Define declarations.
 */
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
 #define BI_RGB  0
 #define BI_RLE8  1
 #define BI_BITFIELDS  3

diff --git a/coders/jpeg.c b/coders/jpeg.c
index c3a813a6e593f8d3f0e9cbeda398089a388369c2..3a5ac41fc974fe04f132d9beb77f906bb4f306bb 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -88,7 +88,7 @@
 #include <setjmp.h>
 #if defined(MAGICKCORE_JPEG_DELEGATE)
 #define JPEG_INTERNAL_OPTIONS
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(__MINGW32__)
 # define XMD_H 1  /* Avoid conflicting typedef for INT32 */
 #endif
 #undef HAVE_STDLIB_H

diff --git a/coders/msl.c b/coders/msl.c
index 26067052c183891ce13d10fed94a8247367567b5..bd0bc43d6447ac208168d98a361904b10249b268 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -94,7 +94,7 @@
 #include "MagickCore/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#    if !defined(__MINGW32__) && !defined(__MINGW64__)
+#    if !defined(__MINGW32__)
 #      include <win32config.h>
 #    endif
 #  endif

diff --git a/coders/svg.c b/coders/svg.c
index f7ade3a478ba57bc90e203fc863203a46b04f177..d7f6dec2c5f87372f6adc600f61673d8ac765ce2 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -76,7 +76,7 @@
 #include "MagickCore/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#    if !defined(__MINGW32__) && !defined(__MINGW64__)
+#    if !defined(__MINGW32__)
 #      include <win32config.h>
 #    endif
 #  endif

diff --git a/coders/url.c b/coders/url.c
index 23e51b0a538eda346056405435b033a65f0f6b91..b819ee3251c112e071c91f1f2c02217bf6531b7d 100644 (file)
--- a/coders/url.c
+++ b/coders/url.c
@@ -59,7 +59,7 @@
 #include "MagickCore/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#    if !defined(__MINGW32__) && !defined(__MINGW64__)
+#    if !defined(__MINGW32__)
 #      include <win32config.h>
 #    endif
 #  endif
@@ -69,7 +69,7 @@
 #  include <libxml/nanohttp.h>
 #endif
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
-    !(defined(__MINGW32__) || defined(__MINGW64__))
+    !defined(__MINGW32__)
 #  include <urlmon.h>
 #  pragma comment(lib, "urlmon.lib")
 #endif
@@ -175,7 +175,7 @@ static Image *ReadURLImage(const ImageInfo *image_info,ExceptionInfo *exception)
   (void) ConcatenateMagickString(filename,image_info->filename,
     MagickPathExtent);
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
-    !(defined(__MINGW32__) || defined(__MINGW64__))
+    !defined(__MINGW32__)
   (void) fclose(file);
   if (URLDownloadToFile(NULL,filename,read_info->filename,0,NULL) != S_OK)
     {
@@ -280,7 +280,7 @@ ModuleExport size_t RegisterURLImage(void)
 
   entry=AcquireMagickInfo("URL","HTTP","Uniform Resource Locator (http://)");
 #if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \
-    !(defined(__MINGW32__) || defined(__MINGW64__))) || \
+    !defined(__MINGW32__)) || \
     (defined(MAGICKCORE_XML_DELEGATE) && defined(LIBXML_HTTP_ENABLED))
   entry->decoder=(DecodeImageHandler *) ReadURLImage;
 #endif
@@ -288,14 +288,14 @@ ModuleExport size_t RegisterURLImage(void)
   (void) RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("URL","HTTPS","Uniform Resource Locator (https://)");
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
-    !(defined(__MINGW32__) || defined(__MINGW64__))
+    !defined(__MINGW32__)
   entry->decoder=(DecodeImageHandler *) ReadURLImage;
 #endif
   entry->format_type=ImplicitFormatType;
   (void) RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("URL","FTP","Uniform Resource Locator (ftp://)");
 #if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \
-    !(defined(__MINGW32__) || defined(__MINGW64__))) || \
+    !defined(__MINGW32__)) || \
     (defined(MAGICKCORE_XML_DELEGATE) && defined(LIBXML_FTP_ENABLED))
   entry->decoder=(DecodeImageHandler *) ReadURLImage;
 #endif

diff --git a/utilities/magick.c b/utilities/magick.c
index d1e0b15a57017258a8fc10744d796b08f5aa4106..f2dee6aae54d19e3b1aa8d065bcaac5637795450 100644 (file)
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -174,7 +174,7 @@ static int MagickMain(int argc,char **argv)
   return(exit_code);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
 int main(int argc,char **argv)
 {
   return(MagickMain(argc,argv));