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/arena.c | |
| parent | e3c0687de17a97e5dcd991841b54bec181b30e90 (diff) | |
| download | glibc-92e1ab0eb58c57d5843fa982ff6c24f551f2f634.tar.gz glibc-92e1ab0eb58c57d5843fa982ff6c24f551f2f634.tar.xz glibc-92e1ab0eb58c57d5843fa982ff6c24f551f2f634.zip | |
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/arena.c')
| -rw-r--r-- | malloc/arena.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/arena.c b/malloc/arena.c index 64a118c319..ed5a4d5cd3 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -341,7 +341,7 @@ ptmalloc_init (void) __malloc_check_init (); } #if HAVE_MALLOC_INIT_HOOK - void (*hook) (void) = atomic_forced_read (old__malloc_initialize_hook); + void (*hook) (void) = atomic_forced_read (__malloc_initialize_hook); if (hook != NULL) (*hook)(); #endif |