From cc883f929b83c8273670a4e52dec7acb9e9689fe Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 5 Feb 2012 23:10:51 +0000 Subject: [PATCH] --- MagickCore/MagickCore.h | 2 +- MagickCore/studio.h | 2 +- MagickWand/MagickWand.h | 2 +- MagickWand/studio.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index 6eb7d2ef6..e47eec734 100644 --- 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 a6039ecff..c05e66c25 100644 --- 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 a969f8753..ada00f800 100644 --- 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 19cc76577..3dafb928f 100644 --- 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_ -- 2.50.1