about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Makefile2
-rw-r--r--malloc/malloc.c2
-rw-r--r--malloc/mtrace.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index 226ed99fc3..bb7d15db7b 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -56,6 +56,8 @@ aux := set-freeres
 
 include ../Makeconfig
 
+CPPFLAGS-memusagestat = -DNOT_IN_libc
+
 # The Perl script to analyze the output of the mtrace functions.
 ifneq ($(PERL),no)
 install-bin-script = mtrace
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 08b8e86794..685514900c 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -490,6 +490,8 @@ Void_t *(*__morecore)(ptrdiff_t) = __default_morecore;
 
 #ifndef _LIBC
 #define __builtin_expect(expr, val)	(expr)
+
+#define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
 #endif
 
 /*
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 171eb5a570..52347ea117 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -42,6 +42,7 @@
 # include <libio/iolibio.h>
 # define fopen(f, n) _IO_fopen64 (f, n)
 # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
+# define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
 #endif
 
 #ifndef attribute_hidden