From e4a289d62e1ce33ef8ca0fa17f23163d6ea4dd63 Mon Sep 17 00:00:00 2001 From: "gandalf%firefox.pl" Date: Sat, 11 Jun 2005 12:52:23 +0000 Subject: [PATCH] Bug 288823: Trace-malloc fails to compile on windows; p=bugzilla@mcsmurf.de,r+sr=dbaron,a=brendan git-svn-id: svn://10.0.0.236/trunk@174468 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/library/Makefile.in | 4 ++++ mozilla/tools/trace-malloc/lib/nsTraceMalloc.c | 2 +- mozilla/tools/trace-malloc/lib/nsTraceMalloc.h | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in index fae1c68f08f..9ecb7721bc4 100644 --- a/mozilla/toolkit/library/Makefile.in +++ b/mozilla/toolkit/library/Makefile.in @@ -260,6 +260,10 @@ ifdef GC_LEAK_DETECTOR EXTRA_DSO_LIBS += boehm endif +ifdef NS_TRACE_MALLOC +EXTRA_DSO_LIBS += tracemalloc +endif + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LIBS += macmorefiles_s EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX) diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c index d23a4a94fc0..24f566ecab1 100644 --- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c +++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c @@ -2083,7 +2083,7 @@ NS_TraceMallocFlushLogfiles() } PR_IMPLEMENT(void) -NS_TrackAllocation(__ptr_t ptr, FILE *ofp) +NS_TrackAllocation(void* ptr, FILE *ofp) { PLHashEntry **hep; allocation *alloc; diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h index c4f5c9a6df4..9d821a32903 100644 --- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h +++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.h @@ -43,6 +43,10 @@ #include /* for FILE */ #include "prtypes.h" +#ifdef XP_WIN +#define setlinebuf(stream) setvbuf((stream), (char *)NULL, _IOLBF, 0) +#endif + PR_BEGIN_EXTERN_C /** @@ -220,7 +224,7 @@ NS_TraceMallocFlushLogfiles(void); * Track all realloc and free calls operating on a given allocation. */ PR_EXTERN(void) -NS_TrackAllocation(__ptr_t ptr, FILE *ofp); +NS_TrackAllocation(void* ptr, FILE *ofp); PR_END_EXTERN_C