From 404d4cef440253fa66168ca674c4aaf80c05d512 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 23 Aug 2002 10:53:52 +0000 Subject: * malloc/hooks.c (__malloc_initialize_hook, __free_hook, __malloc_hook, __realloc_hook, __memalign_hook, __after_morecore_hook): Variable definitions moved to ... * malloc/malloc.c: ... here, so as to be before all references. --- malloc/hooks.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'malloc/hooks.c') diff --git a/malloc/hooks.c b/malloc/hooks.c index 9fab05c307..a36980360a 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -20,40 +20,6 @@ /* $Id$ */ -#ifndef weak_variable -#ifndef _LIBC -#define weak_variable /**/ -#else -/* In GNU libc we want the hook variables to be weak definitions to - avoid a problem with Emacs. */ -#define weak_variable weak_function -#endif -#endif - -/* Forward declarations. */ -static Void_t* malloc_hook_ini __MALLOC_P ((size_t sz, - const __malloc_ptr_t caller)); -static Void_t* realloc_hook_ini __MALLOC_P ((Void_t* ptr, size_t sz, - const __malloc_ptr_t caller)); -static Void_t* memalign_hook_ini __MALLOC_P ((size_t alignment, size_t sz, - const __malloc_ptr_t caller)); - -/* Define and initialize the hook variables. These weak definitions must - appear before any use of the variables in a function. */ -void weak_variable (*__malloc_initialize_hook) __MALLOC_P ((void)) = NULL; -void weak_variable (*__free_hook) __MALLOC_P ((__malloc_ptr_t __ptr, - const __malloc_ptr_t)) = NULL; -__malloc_ptr_t weak_variable (*__malloc_hook) - __MALLOC_P ((size_t __size, const __malloc_ptr_t)) = malloc_hook_ini; -__malloc_ptr_t weak_variable (*__realloc_hook) - __MALLOC_P ((__malloc_ptr_t __ptr, size_t __size, const __malloc_ptr_t)) - = realloc_hook_ini; -__malloc_ptr_t weak_variable (*__memalign_hook) - __MALLOC_P ((size_t __alignment, size_t __size, const __malloc_ptr_t)) - = memalign_hook_ini; -void weak_variable (*__after_morecore_hook) __MALLOC_P ((void)) = NULL; - - #ifndef DEFAULT_CHECK_ACTION #define DEFAULT_CHECK_ACTION 1 #endif -- cgit v1.2.3