summaryrefslogtreecommitdiffstats
path: root/libc/stdlib/malloc-standard/malloc.h
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2006-01-07 02:32:27 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2006-01-07 02:32:27 +0000
commite523bd15353350c3480b8a1820a0944b0fa8212e (patch)
tree60485116f9c62c306bb753f12f9d4eb79d16aa4e /libc/stdlib/malloc-standard/malloc.h
parent3b3434516a3415d7e0f4e1d50c553876dcb337b2 (diff)
downloaduClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.bz2
uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.xz
Big fricking merge from trunk.
Diffstat (limited to 'libc/stdlib/malloc-standard/malloc.h')
-rw-r--r--libc/stdlib/malloc-standard/malloc.h3
1 files changed, 2 insertions, 1 deletions
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 */