(no commit message)

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index 6eb7d2ef65dae51f03776c36766f9c504b3f1fac..e47eec73420e7ece9bd08afbc8b93f9395b6851f 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -55,7 +55,7 @@ extern "C" {
 #  define MAGICKCORE_POSIX_SUPPORT
 #endif 
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define MagickPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
 #  define _MAGICKDLL_

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index a6039ecff9c242d7272a4e76cfa9f350da1517cb..c05e66c256b39bb1d59f4b5fca98060239160c5e 100644 (file)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -70,7 +70,7 @@ extern "C" {
 #  undef MAGICKCORE_BUILD_MODULES
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define MagickPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index a969f87539f0bc1b898b3eeb35c630e40fe1f3f2..ada00f800c7ab2ac5654a40a858fa5c9398fae21 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -55,7 +55,7 @@ extern "C" {
 #  define MAGICKCORE_POSIX_SUPPORT
 #endif 
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_

diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 19cc76577dff734edc3e1d02a132cd3aa110c01e..3dafb928f5644a297eb3839af95d01bef52f64e9 100644 (file)
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -64,7 +64,7 @@ extern "C" {
 #  define _MAGICKLIB_
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_