Bug 946189 - Fix Windows build issue with --disable-crashreporter. r=bsmedberg
authorBill Gianopoulos <wgianopoulos@gmail.com>
Wed, 04 Dec 2013 08:20:41 -0500
changeset 174477 638131799dd7dfe181c3da30acfaad5e26f8c880
parent 174476 9d673e562fa695054a08f92e73f0773511845aed
child 174478 c590c170652b76a8a6a0b6a0dad1c757294fc6cf
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs946189
milestone28.0a1
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 946189 - Fix Windows build issue with --disable-crashreporter. r=bsmedberg
dom/plugins/ipc/PluginModuleParent.cpp
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -1555,22 +1555,24 @@ PluginModuleParent::AllocPCrashReporterP
 #else
     return nullptr;
 #endif
 }
 
 bool
 PluginModuleParent::DeallocPCrashReporterParent(PCrashReporterParent* actor)
 {
+#ifdef MOZ_CRASHREPORTER
 #ifdef XP_WIN
     mozilla::MutexAutoLock lock(mCrashReporterMutex);
     if (actor == static_cast<PCrashReporterParent*>(mCrashReporter)) {
         mCrashReporter = nullptr;
     }
 #endif
+#endif
     delete actor;
     return true;
 }
 
 bool
 PluginModuleParent::RecvSetCursor(const NSCursorInfo& aCursorInfo)
 {
     PLUGIN_LOG_DEBUG(("%s", FULLFUNCTION));