From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 19 Nov 2009 19:26:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10365
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=851c94b519ea4edc2f57e292989383771a8764c0;p=imagemagick

---

diff --git a/magick/studio.h b/magick/studio.h
index c1e82f52d..1db0f8db1 100644
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -231,7 +231,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 #if !defined(magick_attribute)
-#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
+#  if (defined(__GNUC__) && (__GNUC__ > 3))
 #    define magick_attribute  __attribute__
 #  else
 #    define magick_attribute(x)  /* nothing */
@@ -239,7 +239,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 #if !defined(magick_unused)
-#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
+#  if (defined(__GNUC__) && (__GNUC__ > 3))
 #     define magick_unused(x)  magick_unused_ ## x __attribute__((unused))
 #  elif defined(__LCLINT__)
 #    define magick_unused(x) /*@unused@*/ x
diff --git a/wand/studio.h b/wand/studio.h
index 76d5163ac..fb3b0ef95 100644
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -231,7 +231,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 #if !defined(wand_attribute)
-#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
+#  if (defined(__GNUC__) && (__GNUC__ > 3))
 #    define wand_attribute  __attribute__
 #  else
 #    define wand_attribute(x)  /* nothing */
@@ -239,7 +239,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 #if !defined(wand_unused)
-#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
+#  if (defined(__GNUC__) && (__GNUC__ > 3))
 #    define wand_unused(x)  wand_unused_ ## x __attribute__((unused))
 #  elif defined(__LCLINT__)
 #    define wand_unused(x) /*@unused@*/ x