568467 - trace-malloc support for Windows x64 ("nsDebugHelpWin32.cpp should only be built in Win32 x86 builds")

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Makoto Kato [:m_kato]]

Need this to support --enable-trace-malloc.



cl -FonsDebugHelpWin32.obj -c   -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES  -DZLIB_INTERNAL -DOSTYPE=\"WINNT6.1\" -DOSARCH=WINNT  -I/c/builds/moz2_slave/mozilla-central-win64-debug-nightly/build/tools/trace-malloc/lib -I. -I../../../dist/include -I../../../dist/include/nsprpub  -Ic:/builds/moz2_slave/mozilla-central-win64-debug-nightly/objdir/dist/include/nspr -Ic:/builds/moz2_slave/mozilla-central-win64-debug-nightly/objdir/dist/include/nss         -GR- -TP -nologo -Zc:wchar_t- -W3 -Gy -Fdgenerated.pdb -wd4800  -DDEBUG -D_DEBUG -DDEBUG_cltbld -DTRACING -Zi -MDd           -FI ../../../dist/include/mozilla-config.h -DMOZILLA_CLIENT /c/builds/moz2_slave/mozilla-central-win64-debug-nightly/build/tools/trace-malloc/lib/nsDebugHelpWin32.cpp
nsDebugHelpWin32.cpp
c:/builds/moz2_slave/mozilla-central-win64-debug-nightly/build/tools/trace-malloc/lib/nsDebugHelpWin32.cpp(52) : fatal error C1189: #error :  "nsDebugHelpWin32.cpp should only be built in Win32 x86 builds"
make[4]: Leaving directory `/c/builds/moz2_slave/mozilla-central-win64-debug-nightly/objdir/tools/trace-malloc/lib'

Comment 1

[Armen [:armenzg]]

That's right I am hitting this problem on the debug builds since the mozconfig I chose was based off the win32's one.

http://hg.mozilla.org/users/armenzg_mozilla.com/buildbot-configs/file/2375134feabd/mozilla2-staging/win64/mozilla-central/debug/mozconfig

Comment 2

[Makoto Kato [:m_kato]]

Attachment: patch

Comment 3

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 447914 [details] [diff] [review]
patch

r=dbaron

Comment 4

[Makoto Kato [:m_kato]]

landed
http://hg.mozilla.org/mozilla-central/rev/6dbc5341b490