From d2fe6cb935a31ca54639635f6ee7ccb6cc95fe9e Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 19 Nov 2009 19:00:50 +0000
Subject: [PATCH]

---
 magick/memory_.h | 14 ++++++++------
 magick/string_.h |  9 ++++++---
 magick/studio.h  | 14 +++++++-------
 wand/studio.h    | 10 +++++-----
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/magick/memory_.h b/magick/memory_.h
index 8cf6ccaa8..e6487ce45 100644
--- 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 be346fb25..ee6cb09e5 100644
--- 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 779e35e08..c1e82f52d 100644
--- 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 4faa060ee..76d5163ac 100644
--- 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
-- 
2.50.1