Bug 612258 - xulrunner compilation failure after landing bug 603679 r=khuey a=NPOTB
authorJacek Caban <jacek@codeweavers.com>
Mon, 15 Nov 2010 15:19:57 +0000
changeset 57512 4b11b59eefe22e462bcdf0c851b78f2971377f01
parent 57511 523e1142a120b554324fbc48ddd6221713de01af
child 57513 04a2ce3c9d2fdfcf077cb6673498992e2d0f81cc
push idunknown
push userunknown
push dateunknown
reviewerskhuey, NPOTB
bugs612258, 603679
milestone2.0b8pre
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 612258 - xulrunner compilation failure after landing bug 603679 r=khuey a=NPOTB
toolkit/xre/nsWindowsWMain.cpp
xulrunner/stub/nsXULStub.cpp
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -2,17 +2,20 @@
 // similar bootstrap code. It converts wide-character windows wmain into UTF-8
 // narrow-character strings.
 
 #ifndef XP_WIN
 #error This file only makes sense on Windows.
 #endif
 
 #include "nsUTF8Utils.h"
+
+#ifndef XRE_DONT_PROTECT_DLL_LOAD
 #include "nsSetDllDirectory.h"
+#endif
 
 #if defined(_MSC_VER) && defined(_M_IX86) && defined(XRE_WANT_DLL_BLOCKLIST)
 #include "nsWindowsDllBlocklist.cpp"
 #else
 #undef XRE_WANT_DLL_BLOCKLIST
 #endif
 
 
--- a/xulrunner/stub/nsXULStub.cpp
+++ b/xulrunner/stub/nsXULStub.cpp
@@ -70,16 +70,17 @@
 #else
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #define PATH_SEPARATOR_CHAR '/'
 #endif
 
 #ifdef XP_WIN
+#define XRE_DONT_PROTECT_DLL_LOAD
 #include "nsWindowsWMain.cpp"
 #endif
 
 #ifdef XP_BEOS
 #include <Entry.h>
 #include <Path.h>
 #endif