about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-12-29 16:49:53 -0500
committerMike Frysinger <vapier@gentoo.org>2013-02-18 17:19:00 -0500
commit4be9b544ea79d601b82bf9eb82549cc627584630 (patch)
tree3bf94f07be48c6458b4a4c29a072312a907dff55
parent2f62b9ee0c086f72ded8abfe84c6d5ab86c49ab1 (diff)
downloadglibc-4be9b544ea79d601b82bf9eb82549cc627584630.tar.gz
glibc-4be9b544ea79d601b82bf9eb82549cc627584630.tar.xz
glibc-4be9b544ea79d601b82bf9eb82549cc627584630.zip
stdlib.h: use existing malloc/alloc_size attribute defines
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--ChangeLog5
-rw-r--r--stdlib/stdlib.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 12559ab9df..16085476ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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
 	__attribute_alloc_size__.
 	* include/sys/cdefs.h (__attribute_alloc_size): Macro removed.
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index fa1175c028..f7a818aa65 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