diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 15:10:57 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 15:10:57 +0000 |
| commit | 7fe677c6d31a6fd854eaf64609d72b8613ca36ea (patch) | |
| tree | 4c65df7c08e0730d0686b169545be93177080810 /libc/stdlib/malloc-standard | |
| parent | eb853014235c86b33318f16e205ff2f818e5a67c (diff) | |
| download | uClibc-alpine-7fe677c6d31a6fd854eaf64609d72b8613ca36ea.tar.bz2 uClibc-alpine-7fe677c6d31a6fd854eaf64609d72b8613ca36ea.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdlib/malloc-standard')
| -rw-r--r-- | libc/stdlib/malloc-standard/mallinfo.c | 5 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/malloc.h | 1 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/realloc.c | 2 |
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" |