Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable

[gnulib.git] / lib / eealloc.h

diff --git a/lib/eealloc.h b/lib/eealloc.h
index 72476da..7249ac7 100644 (file)
--- a/lib/eealloc.h
+++ b/lib/eealloc.h
@@ -1,12 +1,12 @@
 /* Memory allocation with expensive empty allocations.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008, 2010-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003,
    based on prior work by Jim Meyering.
 
-   This program is free software; you can redistribute it and/or modify
+   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 Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _EEALLOC_H
 #define _EEALLOC_H
@@ -35,6 +34,14 @@
 #if MALLOC_0_IS_NONNULL
 # define eemalloc malloc
 #else
+# if __GNUC__ >= 3
+static inline void *eemalloc (size_t n)
+     __attribute__ ((__malloc__))
+#  if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+     __attribute__ ((__alloc_size__ (1)))
+#  endif
+  ;
+# endif
 static inline void *
 eemalloc (size_t n)
 {
@@ -48,6 +55,10 @@ eemalloc (size_t n)
 #if REALLOC_0_IS_NONNULL
 # define eerealloc realloc
 #else
+# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+static inline void *eerealloc (void *p, size_t n)
+     __attribute__ ((__alloc_size__ (2)));
+# endif
 static inline void *
 eerealloc (void *p, size_t n)
 {