svn commit: trunk/uClibc/libc/stdlib: malloc malloc-standard

[psm at uclibc.org]

Author: psm
Date: 2005-12-13 02:02:23 -0800 (Tue, 13 Dec 2005)
New Revision: 12863

Log:
__malloc_consolidate is only libc internal, enable use of __sbrk

Modified:
   trunk/uClibc/libc/stdlib/malloc-standard/free.c
   trunk/uClibc/libc/stdlib/malloc-standard/malloc.h
   trunk/uClibc/libc/stdlib/malloc/free.c
   trunk/uClibc/libc/stdlib/malloc/malloc.c


Changeset:
Modified: trunk/uClibc/libc/stdlib/malloc/free.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/free.c	2005-12-13 10:00:07 UTC (rev 12862)
+++ trunk/uClibc/libc/stdlib/malloc/free.c	2005-12-13 10:02:23 UTC (rev 12863)
@@ -12,6 +12,7 @@
  */
 
 #define munmap __munmap
+#define sbrk __sbrk
 
 #include <stdlib.h>
 #include <unistd.h>

Modified: trunk/uClibc/libc/stdlib/malloc/malloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/malloc.c	2005-12-13 10:00:07 UTC (rev 12862)
+++ trunk/uClibc/libc/stdlib/malloc/malloc.c	2005-12-13 10:02:23 UTC (rev 12863)
@@ -12,6 +12,7 @@
  */
 
 #define mmap __mmap
+#define sbrk __sbrk
 
 #include <stdlib.h>
 #include <unistd.h>

Modified: trunk/uClibc/libc/stdlib/malloc-standard/free.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/free.c	2005-12-13 10:00:07 UTC (rev 12862)
+++ trunk/uClibc/libc/stdlib/malloc-standard/free.c	2005-12-13 10:02:23 UTC (rev 12863)
@@ -169,7 +169,7 @@
   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) */

Modified: trunk/uClibc/libc/stdlib/malloc-standard/malloc.h
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/malloc.h	2005-12-13 10:00:07 UTC (rev 12862)
+++ trunk/uClibc/libc/stdlib/malloc-standard/malloc.h	2005-12-13 10:02:23 UTC (rev 12863)
@@ -16,6 +16,7 @@
 
 #define mmap __mmap
 #define sysconf __sysconf
+#define sbrk __sbrk
 
 #include <features.h>
 #include <stddef.h>
@@ -929,7 +930,7 @@
 #define get_malloc_state() (&(__malloc_state))
 
 /* External internal utilities operating on mstates */
-void   __malloc_consolidate(mstate);
+void   __malloc_consolidate(mstate) attribute_hidden;
 
 
 /* Debugging support */