X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsafe-alloc.h;h=269d1bf496aae40cb95b8fc683600130fb358e58;hb=721f56dcf49f8f004f609cc966f876922faad1a8;hp=d150a08e17497978611bd47338d2c3ed2faeada2;hpb=c26924950a3a546112e35c99aad85c0855f4664a;p=gnulib.git

diff --git a/lib/safe-alloc.h b/lib/safe-alloc.h
index d150a08e1..269d1bf49 100644
--- a/lib/safe-alloc.h
+++ b/lib/safe-alloc.h
@@ -1,6 +1,6 @@
 /* safe-alloc.h: safer memory allocation
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -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:
@@ -59,7 +59,7 @@ safe_alloc_realloc_n (void *ptrptr, size_t size, size_t count)
  * Return -1 on failure to allocate, zero on success
  */
 # define ALLOC(ptr)                                     \
-  safe_alloc_alloc_n (&(ptr), sizeof(*(ptr)), 1, 1)
+  safe_alloc_alloc_n (&(ptr), sizeof (*(ptr)), 1, 1)
 
 /**
  * ALLOC_N:
@@ -73,7 +73,7 @@ safe_alloc_realloc_n (void *ptrptr, size_t size, size_t count)
  * Return -1 on failure, 0 on success
  */
 # define ALLOC_N(ptr, count)                                    \
-  safe_alloc_alloc_n (&(ptr), sizeof(*(ptr)), (count), 1)
+  safe_alloc_alloc_n (&(ptr), sizeof (*(ptr)), (count), 1)
 
 /**
  * ALLOC_N_UNINITIALIZED:
@@ -87,7 +87,7 @@ safe_alloc_realloc_n (void *ptrptr, size_t size, size_t count)
  * Return -1 on failure to allocate, zero on success
  */
 # define ALLOC_N_UNINITIALIZED(ptr, count)                      \
-  safe_alloc_alloc_n (&(ptr), sizeof(*(ptr)), (count), 0)
+  safe_alloc_alloc_n (&(ptr), sizeof (*(ptr)), (count), 0)
 
 /**
  * REALLOC_N:
@@ -101,7 +101,7 @@ safe_alloc_realloc_n (void *ptrptr, size_t size, size_t count)
  * Return -1 on failure to reallocate, zero on success
  */
 # define REALLOC_N(ptr, count)                                  \
-  safe_alloc_realloc_n (&(ptr), sizeof(*(ptr)), (count))
+  safe_alloc_realloc_n (&(ptr), sizeof (*(ptr)), (count))
 
 /**
  * FREE:
@@ -116,6 +116,6 @@ safe_alloc_realloc_n (void *ptrptr, size_t size, size_t count)
       free (ptr);                               \
       (ptr) = NULL;                             \
     }                                           \
-  while(0)
+  while (0)
 
 #endif /* SAFE_ALLOC_H_ */