diff options
author | Peter S. Mazinger <ps.m@gmx.net> | 2005-12-13 10:02:23 +0000 |
---|---|---|
committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-12-13 10:02:23 +0000 |
commit | 68ab26b26ba2a30efd939d899a24a59731738534 (patch) | |
tree | 774c0f3f47f3c187bebd2c8ab36fd999ee3ae0ee | |
parent | 20453d82ab702cd25791a84d10ef73cada4cc3b0 (diff) |
__malloc_consolidate is only libc internal, enable use of __sbrk
-rw-r--r-- | libc/stdlib/malloc-standard/free.c | 2 | ||||
-rw-r--r-- | libc/stdlib/malloc-standard/malloc.h | 3 | ||||
-rw-r--r-- | libc/stdlib/malloc/free.c | 1 | ||||
-rw-r--r-- | libc/stdlib/malloc/malloc.c | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c index aa8edec97..1b294d706 100644 --- a/libc/stdlib/malloc-standard/free.c +++ b/libc/stdlib/malloc-standard/free.c @@ -169,7 +169,7 @@ static void malloc_init_state(mstate av) malloc anyway, it turns out to be the perfect place to trigger initialization code. */ -void __malloc_consolidate(mstate av) +void attribute_hidden __malloc_consolidate(mstate av) { mfastbinptr* fb; /* current fastbin being consolidated */ mfastbinptr* maxfb; /* last fastbin (for loop control) */ diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index 338edeabf..68d38cb3d 100644 --- a/libc/stdlib/malloc-standard/malloc.h +++ b/libc/stdlib/malloc-standard/malloc.h @@ -16,6 +16,7 @@ #define mmap __mmap #define sysconf __sysconf +#define sbrk __sbrk #include <features.h> #include <stddef.h> @@ -929,7 +930,7 @@ extern struct malloc_state __malloc_state; /* never directly referenced */ #define get_malloc_state() (&(__malloc_state)) /* External internal utilities operating on mstates */ -void __malloc_consolidate(mstate); +void __malloc_consolidate(mstate) attribute_hidden; /* Debugging support */ diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c index eb35e78ee..81ec38cd9 100644 --- a/libc/stdlib/malloc/free.c +++ b/libc/stdlib/malloc/free.c @@ -12,6 +12,7 @@ */ #define munmap __munmap +#define sbrk __sbrk #include <stdlib.h> #include <unistd.h> diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c index 44eb2c66f..6bc8d8773 100644 --- a/libc/stdlib/malloc/malloc.c +++ b/libc/stdlib/malloc/malloc.c @@ -12,6 +12,7 @@ */ #define mmap __mmap +#define sbrk __sbrk #include <stdlib.h> #include <unistd.h> |