Bug 678438 - DLL bloclk list for Win64 is turned off by bug 552864. r=glandium
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 12 Aug 2011 15:07:36 +0900
changeset 74286 415a7b342701d2f6ad7bda9b06a72acbbe06b073
parent 74285 c7c13a66ad615d19d2dd91484fa4a3288868a772
child 74287 78dea7cd0f4daaa29e5f8cc0e556d2ce1a990d1b
child 74305 c2213f8c76dd448da1fa9e646cf944eb38608d28
push id1165
push userm_kato@ga2.so-net.ne.jp
push dateFri, 12 Aug 2011 06:08:45 +0000
treeherdermozilla-inbound@415a7b342701 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs678438, 552864
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 678438 - DLL bloclk list for Win64 is turned off by bug 552864. r=glandium
xpcom/build/nsXULAppAPI.h
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -559,17 +559,17 @@ XRE_API(bool,
                                    JSObject** globalp))
 
 XRE_API(bool,
         XRE_ShutdownTestShell, ())
 
 XRE_API(void,
         XRE_InstallX11ErrorHandler, ())
 
-#if defined(_MSC_VER) && defined(_M_IX86)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
 #define XRE_HAS_DLL_BLOCKLIST
 XRE_API(void,
         XRE_SetupDllBlocklist, ())
 #endif
 
 XRE_API(void,
         XRE_TelemetryAccumulate, (int aID, PRUint32 aSample))