autoland: changeset 47848:46af914448aefb49b77f6bba7786b6ba3eea0e2c

author	L. David Baron <dbaron@dbaron.org>
	Fri, 16 Jul 2010 22:36:34 -0700
changeset 47848	46af914448aefb49b77f6bba7786b6ba3eea0e2c
parent 47847	70967e44b56c46a4156b6d957a05dc8e8d9ee72a
child 47849	53a5c3bb6c5c1f7f765982d8c8826b3a6ac81bc7
push id	14446
push user	dbaron@mozilla.com
push date	Sat, 17 Jul 2010 05:37:31 +0000
treeherder	autoland@53a5c3bb6c5c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	cjones
bugs	576776
milestone	2.0b2pre
first release with	nightly linux32 b00bb3a115de / 4.0b2pre / 20100717030004 / files nightly linux64 b00bb3a115de / 4.0b2pre / 20100717030824 / files nightly mac b00bb3a115de / 4.0b2pre / 20100717030745 / files nightly win32 b00bb3a115de / 4.0b2pre / 20100717054110 / files nightly win64 f6ea1d942fe2 / 4.0b2pre / 20100717063401 / files
last release without	nightly linux32 96de199027d7 / 4.0b2pre / 20100716025911 / files nightly linux64 96de199027d7 / 4.0b2pre / 20100716030639 / files nightly mac 96de199027d7 / 4.0b2pre / 20100716030728 / files nightly win32 96de199027d7 / 4.0b2pre / 20100716040830 / files nightly win64 9712aa5f77e1 / 4.0b2pre / 20100716150536 / files

--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -65,14 +65,16 @@ EXPORTS         = nsTraceMalloc.h
 
 EXTRA_DSO_LDOPTS = $(NSPR_LIBS) $(XPCOM_LIBS)
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS		+= nsDebugHelpWin32.cpp nsWinTraceMalloc.cpp
 OS_LIBS		+= shell32.lib ole32.lib uuid.lib imagehlp.lib
 endif
 
+DEFINES		+= -DMOZ_NO_MOZALLOC
+
 ifdef WRAP_SYSTEM_INCLUDES
 DEFINES		+= -DWRAP_SYSTEM_INCLUDES
 endif
 
 include $(topsrcdir)/config/rules.mk