(no commit message)

[imagemagick] / MagickCore / method-attribute.h

diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h
index 6e4cb913e625f8cc2c87d8a6be30e0204da03371..222a18f2c765ac19276945a0f28f9dc4da3d7a65 100644 (file)
--- a/MagickCore/method-attribute.h
+++ b/MagickCore/method-attribute.h
@@ -81,7 +81,6 @@ extern "C" {
 #  endif
 
 # endif
-# define MagickGlobal __declspec(thread)
 # if defined(_VISUALC_)
 #  pragma warning(disable : 4018)
 #  pragma warning(disable : 4068)
@@ -100,7 +99,6 @@ extern "C" {
 #   define MagickPrivate
 # endif
 # define ModuleExport  MagickExport
-# define MagickGlobal
 #endif
 
 #define MagickSignature  0xabacadabUL
@@ -125,7 +123,7 @@ extern "C" {
 #  define magick_unreferenced(x)  /* nothing */
 #endif
 
-#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__)
 #  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
 #  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
 #  define magick_cold_spot  __attribute__((__cold__))