summaryrefslogtreecommitdiffstats
path: root/libc/stdlib/malloc-standard
diff options
context:
space:
mode:
Diffstat (limited to 'libc/stdlib/malloc-standard')
-rw-r--r--libc/stdlib/malloc-standard/mallinfo.c5
-rw-r--r--libc/stdlib/malloc-standard/malloc.h1
-rw-r--r--libc/stdlib/malloc-standard/realloc.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index 51ac423fe..f6c2a9104 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -18,7 +18,7 @@
/* ------------------------------ mallinfo ------------------------------ */
-struct mallinfo mallinfo(void)
+struct mallinfo attribute_hidden __mallinfo(void)
{
mstate av;
struct mallinfo mi;
@@ -78,6 +78,7 @@ struct mallinfo mallinfo(void)
UNLOCK;
return mi;
}
+strong_alias(__mallinfo,mallinfo)
void malloc_stats(FILE *file)
{
@@ -87,7 +88,7 @@ void malloc_stats(FILE *file)
file = stderr;
}
- mi = mallinfo();
+ mi = __mallinfo();
fprintf(file, "total bytes allocated = %10u\n", (unsigned int)(mi.arena + mi.hblkhd));
fprintf(file, "total bytes in use bytes = %10u\n", (unsigned int)(mi.uordblks + mi.hblkhd));
fprintf(file, "total non-mmapped bytes allocated = %10d\n", mi.arena);
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index 0e8aed363..338edeabf 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -14,6 +14,7 @@
Hacked up for uClibc by Erik Andersen <andersen@codepoet.org>
*/
+#define mmap __mmap
#define sysconf __sysconf
#include <features.h>
diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c
index 3d77442af..36bfe4d99 100644
--- a/libc/stdlib/malloc-standard/realloc.c
+++ b/libc/stdlib/malloc-standard/realloc.c
@@ -14,6 +14,8 @@
Hacked up for uClibc by Erik Andersen <andersen@codepoet.org>
*/
+#define mremap __mremap
+
#include "malloc.h"