>From 1005257b104d2dac80479eac2c98246ad29147ec Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 31 Jan 2016 09:50:07 -0800 Subject: [PATCH] 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. --- src/gmalloc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gmalloc.c b/src/gmalloc.c index 282216a..0b76aee 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -321,6 +321,13 @@ License along with this library. If not, see . /* 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]; -- 2.5.0