[git commit] malloc.h: hide internal functions (mainly debug related)
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:30 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=7431f726e2865028c98abc9ea765069fcfe4bc63
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
libc/stdlib/malloc-standard/mallinfo.c | 1 +
libc/stdlib/malloc-standard/malloc.h | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index d60d6d9..3064e53 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -15,6 +15,7 @@
*/
#include "malloc.h"
+#include <stdio.h> /* fprintf */
/* ------------------------------ mallinfo ------------------------------ */
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index 73d4b12..9b411bd 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -26,7 +26,11 @@
-__UCLIBC_MUTEX_EXTERN(__malloc_lock);
+__UCLIBC_MUTEX_EXTERN(__malloc_lock)
+#if defined __UCLIBC_HAS_THREADS__ && !defined __LINUXTHREADS_OLD__
+ attribute_hidden
+#endif
+ ;
#define __MALLOC_LOCK __UCLIBC_MUTEX_LOCK(__malloc_lock)
#define __MALLOC_UNLOCK __UCLIBC_MUTEX_UNLOCK(__malloc_lock)
@@ -910,7 +914,7 @@ typedef struct malloc_state *mstate;
malloc relies on the property that malloc_state is initialized to
all zeroes (as is true of C statics).
*/
-extern struct malloc_state __malloc_state; /* never directly referenced */
+extern struct malloc_state __malloc_state attribute_hidden; /* never directly referenced */
/*
All uses of av_ are via get_malloc_state().
@@ -947,12 +951,12 @@ void __malloc_consolidate(mstate) attribute_hidden;
#define check_malloced_chunk(P,N) __do_check_malloced_chunk(P,N)
#define check_malloc_state() __do_check_malloc_state()
-extern void __do_check_chunk(mchunkptr p);
-extern void __do_check_free_chunk(mchunkptr p);
-extern void __do_check_inuse_chunk(mchunkptr p);
-extern void __do_check_remalloced_chunk(mchunkptr p, size_t s);
-extern void __do_check_malloced_chunk(mchunkptr p, size_t s);
-extern void __do_check_malloc_state(void);
+extern void __do_check_chunk(mchunkptr p) attribute_hidden;
+extern void __do_check_free_chunk(mchunkptr p) attribute_hidden;
+extern void __do_check_inuse_chunk(mchunkptr p) attribute_hidden;
+extern void __do_check_remalloced_chunk(mchunkptr p, size_t s) attribute_hidden;
+extern void __do_check_malloced_chunk(mchunkptr p, size_t s) attribute_hidden;
+extern void __do_check_malloc_state(void) attribute_hidden;
#include <assert.h>
More information about the uClibc-cvs
mailing list