From d5d11318b001eeb71cfaaea1b6fa9bbee8042d13 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 12 May 2024 13:27:43 +0800 Subject: [PATCH] Pacify warnings in gmalloc.c * src/gmalloc.c (__malloc_initialize_hook): Also declare in advance on Glibc 2.24 and later. (__after_morecore_hook, __morecore): Likewise on Glibc 2.34 and later. (cherry picked from commit 67b1da215c9fc103d131e8c568a1e6a75d993f83) --- src/gmalloc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gmalloc.c b/src/gmalloc.c index 2b29f5c6c81..1faf6506167 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -47,11 +47,15 @@ License along with this library. If not, see . #ifndef __MALLOC_HOOK_VOLATILE # define __MALLOC_HOOK_VOLATILE volatile #endif -#ifndef HAVE_MALLOC_H +#if !defined HAVE_MALLOC_H \ + || (__GLIBC__ > 2 || __GLIBC_MINOR__ >= 34) extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); -extern void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); extern void *(*__morecore) (ptrdiff_t); -#endif +#endif /* !defined HAVE_MALLOC_H || glibc >= 2.34 */ +#if !defined HAVE_MALLOC_H \ + || (__GLIBC__ > 2 || __GLIBC_MINOR__ >= 24) +extern void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); +#endif /* !defined HAVE_MALLOC_H || glibc >= 2.24 */ /* If HYBRID_MALLOC is defined, then temacs will use malloc, realloc... as defined in this file (and renamed gmalloc, -- 2.39.5