From e523bd15353350c3480b8a1820a0944b0fa8212e Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 7 Jan 2006 02:32:27 +0000 Subject: Big fricking merge from trunk. --- libc/stdlib/malloc-standard/malloc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libc/stdlib/malloc-standard/malloc.h') 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 #include @@ -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 */ -- cgit v1.2.3