diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | malloc/malloc.c | 28 |
2 files changed, 18 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index daa12bec08..1b4a63045c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-01-06 Ulrich Drepper <drepper@redhat.com> + + * malloc/malloc.c: Makr all _int_* functions as static. + 2003-01-06 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/alpha/sysdep.h (PSEUDO): Use PSEUDO_PREPARE_ARGS. diff --git a/malloc/malloc.c b/malloc/malloc.c index da834d2663..458d96a241 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 1996,1997,1998,1999,2000,01,02 Free Software Foundation, Inc. + Copyright (C) 1996-2002, 2003 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. @@ -1469,11 +1469,11 @@ typedef struct malloc_chunk* mchunkptr; #if __STD_C -Void_t* _int_malloc(mstate, size_t); -void _int_free(mstate, Void_t*); -Void_t* _int_realloc(mstate, Void_t*, size_t); -Void_t* _int_memalign(mstate, size_t, size_t); -Void_t* _int_valloc(mstate, size_t); +static Void_t* _int_malloc(mstate, size_t); +static void _int_free(mstate, Void_t*); +static Void_t* _int_realloc(mstate, Void_t*, size_t); +static Void_t* _int_memalign(mstate, size_t, size_t); +static Void_t* _int_valloc(mstate, size_t); static Void_t* _int_pvalloc(mstate, size_t); /*static Void_t* cALLOc(size_t, size_t);*/ static Void_t** _int_icalloc(mstate, size_t, size_t, Void_t**); @@ -3725,7 +3725,7 @@ public_mALLOPt(int p, int v) ------------------------------ malloc ------------------------------ */ -Void_t* +static Void_t* _int_malloc(mstate av, size_t bytes) { INTERNAL_SIZE_T nb; /* normalized request size */ @@ -4109,7 +4109,7 @@ _int_malloc(mstate av, size_t bytes) ------------------------------ free ------------------------------ */ -void +static void _int_free(mstate av, Void_t* mem) { mchunkptr p; /* chunk corresponding to mem */ @@ -4383,7 +4383,7 @@ static void malloc_consolidate(av) mstate av; ------------------------------ realloc ------------------------------ */ -Void_t* +static Void_t* _int_realloc(mstate av, Void_t* oldmem, size_t bytes) { INTERNAL_SIZE_T nb; /* padded request size */ @@ -4608,7 +4608,7 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes) ------------------------------ memalign ------------------------------ */ -Void_t* +static Void_t* _int_memalign(mstate av, size_t alignment, size_t bytes) { INTERNAL_SIZE_T nb; /* padded request size */ @@ -4774,7 +4774,7 @@ Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size; ------------------------- independent_calloc ------------------------- */ -Void_t** +static Void_t** #if __STD_C _int_icalloc(mstate av, size_t n_elements, size_t elem_size, Void_t* chunks[]) #else @@ -4791,7 +4791,7 @@ mstate av; size_t n_elements; size_t elem_size; Void_t* chunks[]; ------------------------- independent_comalloc ------------------------- */ -Void_t** +static Void_t** #if __STD_C _int_icomalloc(mstate av, size_t n_elements, size_t sizes[], Void_t* chunks[]) #else @@ -4939,7 +4939,7 @@ mstate av; size_t n_elements; size_t* sizes; int opts; Void_t* chunks[]; ------------------------------ valloc ------------------------------ */ -Void_t* +static Void_t* #if __STD_C _int_valloc(mstate av, size_t bytes) #else @@ -4956,7 +4956,7 @@ _int_valloc(av, bytes) mstate av; size_t bytes; */ -Void_t* +static Void_t* #if __STD_C _int_pvalloc(mstate av, size_t bytes) #else |