diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 2004-03-05 11:12:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 11:12:46 +0000 |
| commit | aa420660e08be0da12f473293db8f57e1bcdcc8d (patch) | |
| tree | bd33645dfcdddf9ee8041d990f5f125ac697fd34 /malloc | |
| parent | Update. (diff) | |
| download | glibc-aa420660e08be0da12f473293db8f57e1bcdcc8d.tar.gz glibc-aa420660e08be0da12f473293db8f57e1bcdcc8d.tar.bz2 glibc-aa420660e08be0da12f473293db8f57e1bcdcc8d.zip | |
Update.
* malloc/malloc.c: Don't call exported interface in the implementation.
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 4e959d20a2..48392623e5 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger <wg@malloc.de> and Doug Lea <dl@cs.oswego.edu>, 2001. @@ -828,6 +828,9 @@ Void_t* public_mALLOc(size_t); #else Void_t* public_mALLOc(); #endif +#ifdef libc_hidden_proto +libc_hidden_proto (public_mALLOc) +#endif /* free(Void_t* p) @@ -845,6 +848,9 @@ void public_fREe(Void_t*); #else void public_fREe(); #endif +#ifdef libc_hidden_proto +libc_hidden_proto (public_fREe) +#endif /* calloc(size_t n_elements, size_t element_size); @@ -889,6 +895,9 @@ Void_t* public_rEALLOc(Void_t*, size_t); #else Void_t* public_rEALLOc(); #endif +#ifdef libc_hidden_proto +libc_hidden_proto (public_rEALLOc) +#endif /* memalign(size_t alignment, size_t n); @@ -907,6 +916,9 @@ Void_t* public_mEMALIGn(size_t, size_t); #else Void_t* public_mEMALIGn(); #endif +#ifdef libc_hidden_proto +libc_hidden_proto (public_mEMALIGn) +#endif /* valloc(size_t n); @@ -3318,6 +3330,9 @@ public_mALLOc(size_t bytes) ar_ptr == arena_for_chunk(mem2chunk(victim))); return victim; } +#ifdef libc_hidden_def +libc_hidden_def(public_mALLOc) +#endif void public_fREe(Void_t* mem) @@ -3359,6 +3374,9 @@ public_fREe(Void_t* mem) _int_free(ar_ptr, mem); (void)mutex_unlock(&ar_ptr->mutex); } +#ifdef libc_hidden_def +libc_hidden_def (public_fREe) +#endif Void_t* public_rEALLOc(Void_t* oldmem, size_t bytes) @@ -3433,6 +3451,9 @@ public_rEALLOc(Void_t* oldmem, size_t bytes) ar_ptr == arena_for_chunk(mem2chunk(newp))); return newp; } +#ifdef libc_hidden_def +libc_hidden_def (public_rEALLOc) +#endif Void_t* public_mEMALIGn(size_t alignment, size_t bytes) @@ -3478,7 +3499,9 @@ public_mEMALIGn(size_t alignment, size_t bytes) ar_ptr == arena_for_chunk(mem2chunk(p))); return p; } -strong_alias (public_mEMALIGn, __memalign_internal) +#ifdef libc_hidden_def +libc_hidden_def (public_mEMALIGn) +#endif Void_t* public_vALLOc(size_t bytes) @@ -5403,7 +5426,7 @@ __posix_memalign (void **memptr, size_t alignment, size_t size) if (hook != NULL) mem = (*hook)(alignment, size, RETURN_ADDRESS (0)); else - mem = __memalign_internal (alignment, size); + mem = public_mEMALIGn (alignment, size); if (mem != NULL) { *memptr = mem; |