diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-31 09:50:07 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-31 09:51:24 -0800 |
| commit | dd951c009a28857c14ae6f0d32f9e8fc042f54a4 (patch) | |
| tree | 52443f74220e2667c8f8c0174c3e6fcda5e38d12 /src/gmalloc.c | |
| parent | 0496a19a3277db199571af82a5de07d2f5985f0f (diff) | |
| download | emacs-dd951c009a28857c14ae6f0d32f9e8fc042f54a4.tar.gz | |
Port new hybrid malloc to FreeBSD
Problem reported by Wolfgang Jenkner in: http://bugs.gnu.org/22086#118
* src/gmalloc.c (__malloc_initialize_hook, __after_morecore_hook)
(__morecore) [HYBRID_MALLOC]: Define in this case too.
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 282216a947b..0b76aeef04d 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -321,6 +321,13 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. /* Debugging hook for 'malloc'. */ static void *(*__MALLOC_HOOK_VOLATILE gmalloc_hook) (size_t); +/* Replacements for traditional glibc malloc hooks, for platforms that + do not already have these hooks. Platforms with these hooks all + used relaxed ref/def, so it is OK to define them here too. */ +void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); +void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); +void *(*__morecore) (ptrdiff_t); + #ifndef HYBRID_MALLOC /* Pointer to the base of the first block. */ @@ -347,10 +354,6 @@ size_t _bytes_free; /* Are you experienced? */ int __malloc_initialized; -void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); -void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); -void *(*__morecore) (ptrdiff_t); - #else static struct list _fraghead[BLOCKLOG]; |