(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index f50c66018b891a354e645c793d238a4a7695418f..cd5722f08746fa4d4703c53b2e74153a961502b4 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -79,7 +79,7 @@
 #include "MagickCore/xwindow.h"
 #include "MagickCore/xwindow-private.h"
 #if defined(MAGICKCORE_FREETYPE_DELEGATE)
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined(__MINGW64__)
 #  undef interface
 #endif
 #if defined(MAGICKCORE_HAVE_FT2BUILD_H)

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index d72c1f4c33a5b2dcb382b92a8d2a7c0e21faf015..7af07ae71ec45f04b5b582e497cb8a1f6023e0c2 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__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
 #  define MagickLLConstant(c)  (MagickOffsetType) (c ## i64)
 #  define MagickULLConstant(c)  (MagickSizeType) (c ## ui64)
 #else

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index b329806a834dd48000484e95618261ad1b4e5c7f..553ee07f58ea99b7af72f86227cfb3ccf50a308e 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -1243,7 +1243,7 @@ MagickExport void MagickCoreGenesis(const char *path,
       events=DestroyString(events);
     }
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#if defined(_DEBUG) && !defined(__BORLANDC__) && !defined(__MINGW32__)
+#if defined(_DEBUG) && !defined(__BORLANDC__) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
   if (IsEventLogging() != MagickFalse)
     {
       int

diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index ec3caa9a0bde3fcde0733aa5e1381da5e1eff74c..0d995080886cb7050166efcb1289ed9ec0f5bff7 100644 (file)
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -39,7 +39,7 @@ extern "C" {
 #include <io.h>
 #include <process.h>
 #include <errno.h>
-#if defined(_DEBUG) && !defined(__MINGW32__)
+#if defined(_DEBUG) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
 #include <crtdbg.h>
 #endif
 
@@ -97,7 +97,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
@@ -114,7 +114,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
@@ -328,7 +328,7 @@ typedef struct _NTMEMORYSTATUSEX
     ullAvailExtendedVirtual;
 } NTMEMORYSTATUSEX;
 
-#if !defined(__MINGW32__)
+#if \!defined(__MINGW32__) && \!defined(__MINGW64__)
 struct timezone
 {
   int
@@ -372,7 +372,7 @@ extern MagickPrivate double
 
 extern MagickPrivate int
   Exit(int),
-#if !defined(__MINGW32__)
+#if \!defined(__MINGW32__) && \!defined(__MINGW64__)
   gettimeofday(struct timeval *,struct timezone *),
 #endif
   IsWindows95(void),

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 0efb1b0f345343ac85177a4ebcf7a28c31fd5263..268b8d6b0b7326a96591d5e1d97f0ed34b96d262 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -241,7 +241,7 @@ MagickPrivate int Exit(int status)
   return(0);
 }
 \f
-#if !defined(__MINGW32__)
+#if \!defined(__MINGW32__) && \!defined(__MINGW64__)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %

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

diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
index 23d6f6327ae44d1efe444f27c4f31513039658a0..0a9c6dc25cf13575550af8a8c11a550c7b552003 100644 (file)
--- a/MagickCore/utility-private.h
+++ b/MagickCore/utility-private.h
@@ -47,7 +47,7 @@ extern MagickPrivate void
 
 static inline int access_utf8(const char *path,int mode)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(access(path,mode));
 #else
    int
@@ -71,7 +71,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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(fopen(path,mode));
 #else
    FILE
@@ -105,14 +105,14 @@ static inline FILE *fopen_utf8(const char *path,const char *mode)
 #endif
 }
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && \!defined(__MINGW32__) && \!defined(__MINGW64__)
 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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(open(path,flags,mode));
 #else
    int
@@ -136,7 +136,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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(popen(command,type));
 #else
    FILE
@@ -172,7 +172,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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(unlink(path));
 #else
    int
@@ -196,7 +196,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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(rename(source,destination));
 #else
    int
@@ -231,7 +231,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__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
   return(stat(path,attributes));
 #else
    int

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

diff --git a/coders/dib.c b/coders/dib.c
index 66bef8b2ef71d160ae82696155db67b39349050a..b6579cdb9686ed7c7acdbbd6913432b9f2ee7841 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -154,7 +154,7 @@ static inline size_t MagickMin(const size_t x,const size_t y)
 static MagickBooleanType DecodeImage(Image *image,
   const MagickBooleanType compression,unsigned char *pixels)
 {
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__MINGW32__) || defined(__MINGW64__)
 #define BI_RGB  0
 #define BI_RLE8  1
 #define BI_RLE4  2

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

diff --git a/coders/jpeg.c b/coders/jpeg.c
index b93d3a41bfbd845fd62a6a3cee6360503d7baaaf..89fabd3b73669c2806dd918c49124bc4ef56c784 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -84,7 +84,7 @@
 #include <setjmp.h>
 #if defined(MAGICKCORE_JPEG_DELEGATE)
 #define JPEG_INTERNAL_OPTIONS
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined(__MINGW64__)
 # 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 d0c33174912243e05f14b8804bd71992f09c4805..bec7f21e31ceb1b4d0716356abc91e5b98414901 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -93,7 +93,7 @@
 #include "MagickCore/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#    if defined(__MINGW32__)
+#    if defined(__MINGW32__) || defined(__MINGW64__)
 #      define _MSC_VER
 #    else
 #      include <win32config.h>

diff --git a/coders/svg.c b/coders/svg.c
index e0e92e78d73c94fdbccc8a4675af9ac6992e7408..2ceb6f63eddc4568694663bdc13141a992b84281 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -75,7 +75,7 @@
 #include "MagickCore/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#    if defined(__MINGW32__)
+#    if defined(__MINGW32__) || defined(__MINGW64__)
 #      define _MSC_VER
 #    else
 #      include <win32config.h>

diff --git a/coders/url.c b/coders/url.c
index dca5937443ba46b2ca1d634d359487dbb6f9b4da..19dbd73bdceeb5fbda4889cbe4036eb72139dc64 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__)
+#    if defined(__MINGW32__) || defined(__MINGW64__)
 #      define _MSC_VER
 #    else
 #      include <win32config.h>

diff --git a/utilities/animate.c b/utilities/animate.c
index 394b532de332b4e1e0d720271551d580f8981034..8ff70839796508e9fc6d8db5f4b9b863aed6e4be 100644 (file)
--- a/utilities/animate.c
+++ b/utilities/animate.c
@@ -89,7 +89,7 @@ static int AnimateMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(AnimateMain(argc,argv));

diff --git a/utilities/compare.c b/utilities/compare.c
index c06155ef6cbb6bcff2a54e3bdfbf3858bd3b6c8c..e6adbd54e8e0e3fece1a75667408f2a7473ec350 100644 (file)
--- a/utilities/compare.c
+++ b/utilities/compare.c
@@ -86,7 +86,7 @@ static int CompareMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(CompareMain(argc,argv));

diff --git a/utilities/composite.c b/utilities/composite.c
index 781cb7ffe9ea905f425e35467ec28638b42d21ea..f37c17f48bd213f0811ecdb66d573103a747c5ac 100644 (file)
--- a/utilities/composite.c
+++ b/utilities/composite.c
@@ -80,7 +80,7 @@ static int CompositeMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(CompositeMain(argc,argv));

diff --git a/utilities/conjure.c b/utilities/conjure.c
index c89e283fa1e3a5c420f209612088fd0b88c1762f..9f6c1c4791e5e007cb61870c18e7d9c1a0297bfb 100644 (file)
--- a/utilities/conjure.c
+++ b/utilities/conjure.c
@@ -99,7 +99,7 @@ static int ConjureMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(ConjureMain(argc,argv));

diff --git a/utilities/convert.c b/utilities/convert.c
index 3bfbb608a6b9461c4305cbd7e36757e9615e4b7c..513324c5ca91d23821eb14e5499d99994f56166b 100644 (file)
--- a/utilities/convert.c
+++ b/utilities/convert.c
@@ -86,7 +86,7 @@ static int ConvertMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(ConvertMain(argc,argv));

diff --git a/utilities/display.c b/utilities/display.c
index 77cff2748a6a614c8644c41929461fb9ffd6c83a..95b69eeb36cf6b625dc8d67bdfe3e1b5b3fcc5d8 100644 (file)
--- a/utilities/display.c
+++ b/utilities/display.c
@@ -94,7 +94,7 @@ static int DisplayMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(DisplayMain(argc,argv));

diff --git a/utilities/identify.c b/utilities/identify.c
index 7786757c6357fdb4743c80ccdb163f187f1859ca..b70e1c7965c7f9672ce38f29c867e5289d703aeb 100644 (file)
--- a/utilities/identify.c
+++ b/utilities/identify.c
@@ -87,7 +87,7 @@ static int IdentifyMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(IdentifyMain(argc,argv));

diff --git a/utilities/import.c b/utilities/import.c
index b747fb37ff65b9ce8c50a9ae385295676c91bac3..4dac7337451c14384cbd9d5865e96e404408ac95 100644 (file)
--- a/utilities/import.c
+++ b/utilities/import.c
@@ -86,7 +86,7 @@ static int ImportMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(ImportMain(argc,argv));

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

diff --git a/utilities/mogrify.c b/utilities/mogrify.c
index bb39dc1a04c5261715ce1ca0541c024a9670023f..2f49ac183c7774c0cd39842e6b4bff72cb5196ff 100644 (file)
--- a/utilities/mogrify.c
+++ b/utilities/mogrify.c
@@ -82,7 +82,7 @@ static int MogrifyMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(MogrifyMain(argc,argv));

diff --git a/utilities/montage.c b/utilities/montage.c
index 0ee291dfff5ead6e3779e19938d52aa110a821d9..13ad8e39e2f6172334d0240512f0ccf9bc120740 100644 (file)
--- a/utilities/montage.c
+++ b/utilities/montage.c
@@ -82,7 +82,7 @@ static int MontageMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(MontageMain(argc,argv));

diff --git a/utilities/stream.c b/utilities/stream.c
index 0ba165d94be34aba59935103238afd50b7497fa0..324c5cf6962890ada509265ab5203319d9d9c374 100644 (file)
--- a/utilities/stream.c
+++ b/utilities/stream.c
@@ -82,7 +82,7 @@ static int StreamMain(int argc,char **argv)
   return(status);
 }
 
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
 int main(int argc,char **argv)
 {
   return(StreamMain(argc,argv));