From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 29 Dec 2012 21:49:53 +0000 (-0500)
Subject: stdlib.h: use existing malloc/alloc_size attribute defines
X-Git-Tag: glibc-2.18~686
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4be9b544ea79d601b82bf9eb82549cc627584630;p=thirdparty%2Fglibc.git

stdlib.h: use existing malloc/alloc_size attribute defines

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/ChangeLog b/ChangeLog
index 12559ab9dfa..16085476ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* stdlib/stdlib.h (aligned_alloc): Use __attribute_malloc__
+	and __attribute_alloc_size__.
+
 2013-02-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* include/programs/xmalloc.h: Change __attribute_alloc_size to
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index fa1175c028b..f7a818aa659 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -507,7 +507,7 @@ extern int posix_memalign (void **__memptr, size_t __alignment, size_t __size)
 #ifdef __USE_ISOC11
 /* ISO C variant of aligned allocation.  */
 extern void *aligned_alloc (size_t __alignment, size_t __size)
-     __THROW __wur __attribute__ ((__malloc__, __alloc_size__ (2)));
+     __THROW __attribute_malloc__ __attribute_alloc_size__ ((2)) __wur;
 #endif
 
 __BEGIN_NAMESPACE_STD