Bug 288823: Trace-malloc fails to compile on windows; p=bugzilla@mcsmurf.de,r+sr=dbaron,a=brendan

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)

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;

tools/trace-malloc/lib/nsTraceMalloc.h

@@ -43,6 +43,10 @@
 #include <stdio.h> /* 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