(no commit message)

diff --git a/magick/memory_.h b/magick/memory_.h
index 8cf6ccaa8b073555a6ce9c5493c0c939984734d8..e6487ce45dbd65762c9b1ff64913284bfd96c5ee 100644 (file)
--- a/magick/memory_.h
+++ b/magick/memory_.h
@@ -28,18 +28,20 @@ typedef void
   *(*ResizeMemoryHandler)(void *,size_t);
 
 extern MagickExport void
-  *AcquireAlignedMemory(const size_t,const size_t),
-  *AcquireMagickMemory(const size_t),
-  *AcquireQuantumMemory(const size_t,const size_t),
-  *CopyMagickMemory(void *,const void *,const size_t),
+  *AcquireAlignedMemory(const size_t,const size_t) magick_attribute((malloc)),
+  *AcquireMagickMemory(const size_t) magick_attribute((malloc)),
+  *AcquireQuantumMemory(const size_t,const size_t) magick_attribute((malloc)),
+  *CopyMagickMemory(void *,const void *,const size_t)
+    magick_attribute((nonnull)),
   DestroyMagickMemory(void),
   GetMagickMemoryMethods(AcquireMemoryHandler *,ResizeMemoryHandler *,
     DestroyMemoryHandler *),
   *RelinquishAlignedMemory(void *),
   *RelinquishMagickMemory(void *),
   *ResetMagickMemory(void *,int,const size_t),
-  *ResizeMagickMemory(void *,const size_t),
-  *ResizeQuantumMemory(void *,const size_t,const size_t),
+  *ResizeMagickMemory(void *,const size_t) magick_attribute((malloc)),
+  *ResizeQuantumMemory(void *,const size_t,const size_t)
+    magick_attribute((malloc)),
   SetMagickMemoryMethods(AcquireMemoryHandler,ResizeMemoryHandler,
     DestroyMemoryHandler);
 

diff --git a/magick/string_.h b/magick/string_.h
index be346fb25b9108553383deb9c358ea0589b46680..ee6cb09e52e63b83a20d4ad69108a500adf70e5b 100644 (file)
--- a/magick/string_.h
+++ b/magick/string_.h
@@ -80,8 +80,10 @@ extern MagickExport int
   CompareStringInfo(const StringInfo *,const StringInfo *);
 
 extern MagickExport size_t
-  ConcatenateMagickString(char *,const char *,const size_t),
-  CopyMagickString(char *,const char *,const size_t),
+  ConcatenateMagickString(char *,const char *,const size_t)
+    magick_attribute((nonnull)),
+  CopyMagickString(char *,const char *,const size_t)
+    magick_attribute((nonnull)),
   GetStringInfoLength(const StringInfo *);
 
 extern MagickExport StringInfo
@@ -97,7 +99,8 @@ extern MagickExport unsigned char
   *GetStringInfoDatum(const StringInfo *);
 
 extern MagickExport void
-  ConcatenateStringInfo(StringInfo *,const StringInfo *),
+  ConcatenateStringInfo(StringInfo *,const StringInfo *)
+    magick_attribute((nonnull)),
   LocaleLower(char *),
   LocaleUpper(char *),
   PrintStringInfo(FILE *file,const char *,const StringInfo *),

diff --git a/magick/studio.h b/magick/studio.h
index 779e35e0893ba240dbe004ff3832ac3bfa4ca0db..c1e82f52df388fc059de2ad0573cb1a7dcf14ec5 100644 (file)
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -1,12 +1,12 @@
 /*
   Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
-  
+
   You may not use this file except in compliance with the License.
   obtain a copy of the License at
-  
+
     http://www.imagemagick.org/script/license.php
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -231,15 +231,15 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 #if !defined(magick_attribute)
-#  if (!defined(__GNUC__) || (__GNUC__ < 2 || __STRICT_ANSI__))
-#    define magick_attribute(x)  /* nothing */
-#  else
+#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
 #    define magick_attribute  __attribute__
+#  else
+#    define magick_attribute(x)  /* nothing */
 #  endif
 #endif
 
 #if !defined(magick_unused)
-#  if defined(__GNUC__)
+#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
 #     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 4faa060eed519410a18fc55ff983d99a24e8ce45..76d5163acb6954f695c9dc8b1e378a0148f4c96c 100644 (file)
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -231,16 +231,16 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 #if !defined(wand_attribute)
-#  if (!defined(__GNUC__) || (__GNUC__ < 2 || __STRICT_ANSI__))
-#    define wand_attribute(x)  /* nothing */
-#  else
+#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
 #    define wand_attribute  __attribute__
+#  else
+#    define wand_attribute(x)  /* nothing */
 #  endif
 #endif
 
 #if !defined(wand_unused)
-#  if defined(__GNUC__)
-#     define wand_unused(x)  wand_unused_ ## x __attribute__((unused))
+#  if (defined(__GNUC__) && (__GNUC__ > 3) && !defined( __STRICT_ANSI__))
+#    define wand_unused(x)  wand_unused_ ## x __attribute__((unused))
 #  elif defined(__LCLINT__)
 #    define wand_unused(x) /*@unused@*/ x
 #  else