From 55512a4c8afcfed091d8fd75366e44740eaf4d4e Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 22 May 2012 08:46:17 +0200
Subject: [PATCH] Bug 658848 - Clean up XRE_WANT_DLL_BLOCKLIST. r=bsmedberg

---
 toolkit/xre/nsWindowsDllBlocklist.cpp |  4 ----
 toolkit/xre/nsWindowsWMain.cpp        | 11 -----------
 2 files changed, 15 deletions(-)

diff --git a/toolkit/xre/nsWindowsDllBlocklist.cpp b/toolkit/xre/nsWindowsDllBlocklist.cpp
index e6a5cc86a94..afecc6be141 100644
--- a/toolkit/xre/nsWindowsDllBlocklist.cpp
+++ b/toolkit/xre/nsWindowsDllBlocklist.cpp
@@ -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"
diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
index 474f426831f..3a2e39514b1 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -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;