diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-06-20 11:11:29 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-06-20 11:11:29 +0200 |
| commit | 92e1ab0eb58c57d5843fa982ff6c24f551f2f634 (patch) | |
| tree | e9080190c7a4e80722d4d30ca22ed55bc09bff09 /malloc/malloc.c | |
| parent | e3c0687de17a97e5dcd991841b54bec181b30e90 (diff) | |
| download | glibc-92e1ab0eb58c57d5843fa982ff6c24f551f2f634.zip glibc-92e1ab0eb58c57d5843fa982ff6c24f551f2f634.tar.gz glibc-92e1ab0eb58c57d5843fa982ff6c24f551f2f634.tar.bz2 | |
Revert __malloc_initialize_hook symbol poisoning
It turns out the Emacs-internal malloc implementation uses
__malloc_* symbols. If glibc poisons them in <stdc-pre.h>,
Emacs will no longer compile.
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 21a912a..1f5f166 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1851,9 +1851,9 @@ static void *memalign_hook_ini (size_t alignment, size_t sz, const void *caller) __THROW; #if HAVE_MALLOC_INIT_HOOK -void weak_variable (*old__malloc_initialize_hook) (void) = NULL; -compat_symbol (libc, old__malloc_initialize_hook, - old__malloc_initialize_hook, GLIBC_2_0); +void weak_variable (*__malloc_initialize_hook) (void) = NULL; +compat_symbol (libc, __malloc_initialize_hook, + __malloc_initialize_hook, GLIBC_2_0); #endif void weak_variable (*__free_hook) (void *__ptr, |