fixes for mingw-w64

diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 4adbef4f7f9d5e6abd72c1cae63b3e4837805fbc..4182bbed61d4c40991161b2a89e5741b6da145c8 100644 (file)
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -130,7 +130,7 @@ static locale_t AcquireCLocale(void)
 #if defined(MAGICKCORE_HAVE_NEWLOCALE)
   if (c_locale == (locale_t) NULL)
     c_locale=newlocale(LC_ALL_MASK,"C",(locale_t) 0);
-#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
   if (c_locale == (locale_t) NULL)
     c_locale=_create_locale(LC_ALL,"C");
 #endif
@@ -260,7 +260,7 @@ static void DestroyCLocale(void)
 #if defined(MAGICKCORE_HAVE_NEWLOCALE)
   if (c_locale != (locale_t) NULL)
     freelocale(c_locale);
-#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
+#elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
   if (c_locale != (locale_t) NULL)
     _free_locale(c_locale);
 #endif

diff --git a/MagickCore/thread_.h b/MagickCore/thread_.h
index 52f84d78db9cd9d0f7a93198033730c762da7d19..8a606d8d8ffe639beb7234ab00a1885e823a815c 100644 (file)
--- a/MagickCore/thread_.h
+++ b/MagickCore/thread_.h
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 #include <intsafe.h>
 #endif