diff options
| author | Paul Eggert | 2016-02-02 09:16:24 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-02-02 09:16:47 -0800 |
| commit | 39d8cac38b1668b3dc12dd5a2cfa35ce57adbac9 (patch) | |
| tree | 82ca22f5d48ecec71e7a3b1ab2847e2143ebafc2 /src/alloc.c | |
| parent | dc435af152e6df3d85b0c21eaf9ff39dce0091bb (diff) | |
| download | emacs-39d8cac38b1668b3dc12dd5a2cfa35ce57adbac9.tar.gz emacs-39d8cac38b1668b3dc12dd5a2cfa35ce57adbac9.zip | |
Port malloc.h hygiene fix to LTO
* src/alloc.c (__malloc_initialize_hook):
Make it externally visible (Bug#22522).
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 57ef4c5deab..b40c1f387cb 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -157,10 +157,12 @@ malloc_initialize_hook (void) | |||
| 157 | } | 157 | } |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | /* Declare the malloc initialization hook, which runs before 'main' starts. | ||
| 161 | EXTERNALLY_VISIBLE works around Bug#22522. */ | ||
| 160 | # ifndef __MALLOC_HOOK_VOLATILE | 162 | # ifndef __MALLOC_HOOK_VOLATILE |
| 161 | # define __MALLOC_HOOK_VOLATILE | 163 | # define __MALLOC_HOOK_VOLATILE |
| 162 | # endif | 164 | # endif |
| 163 | voidfuncptr __MALLOC_HOOK_VOLATILE __malloc_initialize_hook | 165 | voidfuncptr __MALLOC_HOOK_VOLATILE __malloc_initialize_hook EXTERNALLY_VISIBLE |
| 164 | = malloc_initialize_hook; | 166 | = malloc_initialize_hook; |
| 165 | 167 | ||
| 166 | #endif | 168 | #endif |