mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 658848 - Clean up XRE_WANT_DLL_BLOCKLIST. r=bsmedberg
This commit is contained in:
parent
bee280e4c7
commit
55512a4c8a
@ -11,11 +11,7 @@
|
|||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
#ifdef XRE_WANT_DLL_BLOCKLIST
|
|
||||||
#define XRE_SetupDllBlocklist SetupDllBlocklist
|
|
||||||
#else
|
|
||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "nsAutoPtr.h"
|
#include "nsAutoPtr.h"
|
||||||
#include "nsThreadUtils.h"
|
#include "nsThreadUtils.h"
|
||||||
|
@ -16,13 +16,6 @@
|
|||||||
#include "nsSetDllDirectory.h"
|
#include "nsSetDllDirectory.h"
|
||||||
#endif
|
#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__
|
#ifdef __MINGW32__
|
||||||
|
|
||||||
/* MingW currently does not implement a wide version of the
|
/* MingW currently does not implement a wide version of the
|
||||||
@ -84,10 +77,6 @@ int wmain(int argc, WCHAR **argv)
|
|||||||
SetDllDirectoryW(L"");
|
SetDllDirectoryW(L"");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XRE_WANT_DLL_BLOCKLIST
|
|
||||||
SetupDllBlocklist();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
char **argvConverted = new char*[argc + 1];
|
char **argvConverted = new char*[argc + 1];
|
||||||
if (!argvConverted)
|
if (!argvConverted)
|
||||||
return 127;
|
return 127;
|
||||||
|
Loading…
Reference in New Issue
Block a user