Bug 648581 - Add MOZ_CRASHREPORTER ifdefs to nsWindowsDllBlocklist.cpp to fix build errors with --disable-crashreporter; rs=glandium
authorEd Morley <bmo@edmorley.co.uk>
Tue, 20 Sep 2011 11:54:15 +0100
changeset 77184 ab120ebd437be3e0e28a900d27a755876df7ee11
parent 77183 52c42cbf25fb81c19abdc0e32ed6e8d4fe8f5c1e
child 77185 2a4671d164b484282abafe855a2180ca8d5fecd5
child 77189 50b328970b3c561f39b081c6bab9c8dc475f63fd
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersglandium
bugs648581
milestone9.0a1
Bug 648581 - Add MOZ_CRASHREPORTER ifdefs to nsWindowsDllBlocklist.cpp to fix build errors with --disable-crashreporter; rs=glandium
toolkit/xre/nsWindowsDllBlocklist.cpp
--- a/toolkit/xre/nsWindowsDllBlocklist.cpp
+++ b/toolkit/xre/nsWindowsDllBlocklist.cpp
@@ -47,17 +47,19 @@
 #endif
 
 #include "nsAutoPtr.h"
 
 #include "prlog.h"
 
 #include "nsWindowsDllInterceptor.h"
 
+#ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
+#endif
 
 #define ALL_VERSIONS   ((unsigned long long)-1LL)
 
 // DLLs sometimes ship without a version number, particularly early
 // releases. Blocking "version <= 0" has the effect of blocking unversioned
 // DLLs (since the call to get version info fails), but not blocking
 // any versioned instance.
 #define UNVERSIONED    ((unsigned long long)0LL)
@@ -302,12 +304,14 @@ XRE_SetupDllBlocklist()
 
   bool ok = NtDllIntercept.AddHook("LdrLoadDll", reinterpret_cast<intptr_t>(patched_LdrLoadDll), (void**) &stub_LdrLoadDll);
 
 #ifdef DEBUG
   if (!ok)
     printf_stderr ("LdrLoadDll hook failed, no dll blocklisting active\n");
 #endif
 
+#ifdef MOZ_CRASHREPORTER
   if (!ok) {
     CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("DllBlockList Failed\n"));
   }
+#endif
 }