aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-01-13 03:42:27 +0000
committerRoland McGrath <roland@gnu.org>2003-01-13 03:42:27 +0000
commitf1c5213d6908c00e42556e9ac910cf150029f4c2 (patch)
tree97737a5aa00658c356b14b80570e5a253c7e45f5 /malloc
parent2674e3c6fc3d2a1279b0e31877f90a22a523504c (diff)
downloadglibc-f1c5213d6908c00e42556e9ac910cf150029f4c2.tar
glibc-f1c5213d6908c00e42556e9ac910cf150029f4c2.tar.gz
glibc-f1c5213d6908c00e42556e9ac910cf150029f4c2.tar.bz2
glibc-f1c5213d6908c00e42556e9ac910cf150029f4c2.zip
* include/fcntl.h: Declare __libc_creat.
* sysdeps/mach/hurd/Makefile (libmachuser-link.so-no-z-defs, libhurduser-link.so-no-z-defs): New variables. * malloc/malloc.c: Revert last change. * malloc/malloc.h (_int_*): Move these decls to ... * include/malloc.h: ... here. Add attribute_hidden. (_int_valloc): Declare it too.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c28
-rw-r--r--malloc/malloc.h12
2 files changed, 14 insertions, 26 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 458d96a241..da834d2663 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,1997,1998,1999,2000,01,02 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
-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);
+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_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 ------------------------------
*/
-static Void_t*
+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 ------------------------------
*/
-static void
+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 ------------------------------
*/
-static Void_t*
+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 ------------------------------
*/
-static Void_t*
+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 -------------------------
*/
-static Void_t**
+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 -------------------------
*/
-static Void_t**
+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 ------------------------------
*/
-static Void_t*
+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;
*/
-static Void_t*
+Void_t*
#if __STD_C
_int_pvalloc(mstate av, size_t bytes)
#else
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 5ddd780958..bbcdf22b23 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -224,18 +224,6 @@ extern void (*__after_morecore_hook) __MALLOC_PMT ((void));
/* Activate a standard set of debugging hooks. */
extern void __malloc_check_init __MALLOC_P ((void));
-/* Internal routines, operating on "arenas". */
-struct malloc_state;
-typedef struct malloc_state *mstate;
-
-extern mstate _int_new_arena __MALLOC_P ((size_t __ini_size));
-extern __malloc_ptr_t _int_malloc __MALLOC_P ((mstate __m, size_t __size));
-extern void _int_free __MALLOC_P ((mstate __m, __malloc_ptr_t __ptr));
-extern __malloc_ptr_t _int_realloc __MALLOC_P ((mstate __m,
- __malloc_ptr_t __ptr,
- size_t __size));
-extern __malloc_ptr_t _int_memalign __MALLOC_P ((mstate __m, size_t __alignment,
- size_t __size));
#ifdef __cplusplus
}; /* end of extern "C" */