diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h index b8abfa1b69..babfbf3d05 100644 --- a/MagickCore/method-attribute.h +++ b/MagickCore/method-attribute.h @@ -123,14 +123,18 @@ extern "C" { # define magick_unreferenced(x) /* nothing */ #endif -#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__) +#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) # 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__)) -# define magick_hot_spot __attribute__((__hot__)) #else # define magick_alloc_size(x) /* nothing */ # define magick_alloc_sizes(x,y) /* nothing */ +#endif + +#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +# define magick_cold_spot __attribute__((__cold__)) +# define magick_hot_spot __attribute__((__hot__)) +#else # define magick_cold_spot # define magick_hot_spot #endif diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h index 13dbf58136..9ea8f4d7ae 100644 --- a/MagickWand/method-attribute.h +++ b/MagickWand/method-attribute.h @@ -109,14 +109,18 @@ extern "C" { # define wand_unused(x) x #endif -#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__) +#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) # define wand_alloc_size(x) __attribute__((__alloc_size__(x))) # define wand_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) -# define wand_cold_spot __attribute__((__cold__)) -# define wand_hot_spot __attribute__((__hot__)) #else # define wand_alloc_size(x) /* nothing */ # define wand_alloc_sizes(x,y) /* nothing */ +#endif + +#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +# define wand_cold_spot __attribute__((__cold__)) +# define wand_hot_spot __attribute__((__hot__)) +#else # define wand_cold_spot # define wand_hot_spot #endif