mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-27 21:00:50 +00:00
Bug 658848 - Clean up XRE_WANT_DLL_BLOCKLIST. r=bsmedberg
This commit is contained in:
parent
13d16e7003
commit
d49d993f19
@ -11,11 +11,7 @@
|
||||
|
||||
#include <map>
|
||||
|
||||
#ifdef XRE_WANT_DLL_BLOCKLIST
|
||||
#define XRE_SetupDllBlocklist SetupDllBlocklist
|
||||
#else
|
||||
#include "nsXULAppAPI.h"
|
||||
#endif
|
||||
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsThreadUtils.h"
|
||||
|
@ -16,13 +16,6 @@
|
||||
#include "nsSetDllDirectory.h"
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && defined(XRE_WANT_DLL_BLOCKLIST)
|
||||
#include "nsWindowsDllBlocklist.cpp"
|
||||
#else
|
||||
#undef XRE_WANT_DLL_BLOCKLIST
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __MINGW32__
|
||||
|
||||
/* MingW currently does not implement a wide version of the
|
||||
@ -84,10 +77,6 @@ int wmain(int argc, WCHAR **argv)
|
||||
SetDllDirectoryW(L"");
|
||||
#endif
|
||||
|
||||
#ifdef XRE_WANT_DLL_BLOCKLIST
|
||||
SetupDllBlocklist();
|
||||
#endif
|
||||
|
||||
char **argvConverted = new char*[argc + 1];
|
||||
if (!argvConverted)
|
||||
return 127;
|
||||
|
Loading…
x
Reference in New Issue
Block a user