Merge commit 'stable/20110609'

[gnulib.git] / lib / safe-alloc.h

diff --git a/lib/safe-alloc.h b/lib/safe-alloc.h
index 1b5ed15..269d1bf 100644 (file)
--- a/lib/safe-alloc.h
+++ b/lib/safe-alloc.h
@@ -31,22 +31,22 @@
 # endif
 #endif
 
-# ifndef ATTRIBUTE_RETURN_CHECK
+# ifndef _GL_ATTRIBUTE_RETURN_CHECK
 #  if __GNUC_PREREQ (3, 4)
-#   define ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__))
+#   define _GL_ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__))
 #  else
-#   define ATTRIBUTE_RETURN_CHECK
+#   define _GL_ATTRIBUTE_RETURN_CHECK
 #  endif
 # endif
 
 /* Don't call these directly - use the macros below */
 int
 safe_alloc_alloc_n (void *ptrptr, size_t size, size_t count, int zeroed)
-  ATTRIBUTE_RETURN_CHECK;
+  _GL_ATTRIBUTE_RETURN_CHECK;
 
 int
 safe_alloc_realloc_n (void *ptrptr, size_t size, size_t count)
-  ATTRIBUTE_RETURN_CHECK;
+  _GL_ATTRIBUTE_RETURN_CHECK;
 
 /**
  * ALLOC: