From 1ba4f03035faabd9090f61ec5514e2abced5ca29 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 8 Mar 2013 16:46:07 +0000 Subject: Remove __malloc_size_t. --- malloc/mtrace.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'malloc/mtrace.c') diff --git a/malloc/mtrace.c b/malloc/mtrace.c index e9ccfa299d..62867b1182 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -58,11 +58,10 @@ __ptr_t mallwatch; /* Old hook values. */ static void (*tr_old_free_hook) (__ptr_t ptr, const __ptr_t); -static __ptr_t (*tr_old_malloc_hook) (__malloc_size_t size, const __ptr_t); -static __ptr_t (*tr_old_realloc_hook) (__ptr_t ptr, __malloc_size_t size, +static __ptr_t (*tr_old_malloc_hook) (size_t size, const __ptr_t); +static __ptr_t (*tr_old_realloc_hook) (__ptr_t ptr, size_t size, const __ptr_t); -static __ptr_t (*tr_old_memalign_hook) (__malloc_size_t __alignment, - __malloc_size_t __size, +static __ptr_t (*tr_old_memalign_hook) (size_t __alignment, size_t __size, const __ptr_t); /* This function is called when the block being alloc'd, realloc'd, or @@ -160,10 +159,10 @@ tr_freehook (ptr, caller) __libc_lock_unlock (lock); } -static __ptr_t tr_mallochook (__malloc_size_t, const __ptr_t) __THROW; +static __ptr_t tr_mallochook (size_t, const __ptr_t) __THROW; static __ptr_t tr_mallochook (size, caller) - __malloc_size_t size; + size_t size; const __ptr_t caller; { __ptr_t hdr; @@ -190,12 +189,12 @@ tr_mallochook (size, caller) return hdr; } -static __ptr_t tr_reallochook (__ptr_t, __malloc_size_t, const __ptr_t) +static __ptr_t tr_reallochook (__ptr_t, size_t, const __ptr_t) __THROW; static __ptr_t tr_reallochook (ptr, size, caller) __ptr_t ptr; - __malloc_size_t size; + size_t size; const __ptr_t caller; { __ptr_t hdr; @@ -243,11 +242,11 @@ tr_reallochook (ptr, size, caller) return hdr; } -static __ptr_t tr_memalignhook (__malloc_size_t, __malloc_size_t, +static __ptr_t tr_memalignhook (size_t, size_t, const __ptr_t) __THROW; static __ptr_t tr_memalignhook (alignment, size, caller) - __malloc_size_t alignment, size; + size_t alignment, size; const __ptr_t caller; { __ptr_t hdr; -- cgit v1.2.1