components/imagemagick/patches/no__attribute__.patch
changeset 3798 c0f7a9f723ca
parent 1255 b7b09f9348b7
equal deleted inserted replaced
3776:b70e2d3bcc71 3798:c0f7a9f723ca
     1 ImageMagick uses many unsupported attributes by Oracle Solaris Studio.
     1 ImageMagick uses many unsupported attributes by Oracle Solaris Studio.
     2 Supported attributes are here:
     2 Supported attributes are here:
     3 http://docs.oracle.com/cd/E24457_01/html/E21991/gljol.html
     3 http://docs.oracle.com/cd/E24457_01/html/E21991/gljol.html
     4 ================================================================================
     4 This patch comes from in-house; as it is Solaris-specific, it will not
     5 --- ImageMagick-6.7.8/magick/method-attribute.h.orig	Sun Feb 19 10:15:53 2012
     5 be contributed upstream.
     6 +++ ImageMagick-6.7.8/magick/method-attribute.h	Tue Oct 16 06:58:12 2012
     6 
       
     7 --- ImageMagick-6.8.3/magick/method-attribute.h.~1~	2013-01-16 14:17:00.000000000 -0800
       
     8 +++ ImageMagick-6.8.3/magick/method-attribute.h	2015-02-10 20:34:01.057456551 -0800
     7 @@ -110,7 +110,7 @@
     9 @@ -110,7 +110,7 @@
     8  
    10  
     9  #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
    11  #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
    10  #  define magick_aligned(x)  __attribute__((aligned(x)))
    12  #  define magick_aligned(x)  __attribute__((aligned(x)))
    11 -#  define magick_attribute  __attribute__
    13 -#  define magick_attribute  __attribute__
    12 +#  define magick_attribute(x)
    14 +#  define magick_attribute(x)
    13  #  define magick_unused(x)  magick_unused_ ## x __attribute__((unused))
    15  #  define magick_unused(x)  magick_unused_ ## x __attribute__((unused))
    14  #else
    16  #elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
    15  #  define magick_aligned(x)  /* nothing */
    17  #  define magick_aligned(x)  __declspec(align(x))