diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-03 07:54:34 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-03 07:54:34 -0500 |
| commit | aff067358751a03ad1f9e397204490b8bfb2fb29 (patch) | |
| tree | 6d462d2049b215370a4f1075629d71e695ba600d /malloc | |
| parent | 9f1151705e3d861a4d6d680e74158cd708119053 (diff) | |
| parent | db6af3ebf46a83b885455dc03a3c2c1c2c2dedec (diff) | |
| download | glibc-aff067358751a03ad1f9e397204490b8bfb2fb29.tar.xz glibc-aff067358751a03ad1f9e397204490b8bfb2fb29.zip | |
Merge branch 'c11'
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/Versions | 3 | ||||
| -rw-r--r-- | malloc/malloc.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/malloc/Versions b/malloc/Versions index cf0b1e559a..7ca9bdf25f 100644 --- a/malloc/Versions +++ b/malloc/Versions @@ -58,6 +58,9 @@ libc { GLIBC_2.10 { malloc_info; } + GLIBC_2.16 { + aligned_alloc; + } GLIBC_PRIVATE { # Internal startup hook for libpthread. __libc_malloc_pthread_startup; diff --git a/malloc/malloc.c b/malloc/malloc.c index 8608083adb..300e879b8c 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3124,6 +3124,8 @@ public_mEMALIGn(size_t alignment, size_t bytes) ar_ptr == arena_for_chunk(mem2chunk(p))); return p; } +/* For ISO C11. */ +weak_alias (public_mEMALIGn, aligned_alloc) libc_hidden_def (public_mEMALIGn) void* |