From f66690ab970fd56b32e417cffda994b6bb983db1 Mon Sep 17 00:00:00 2001 From: Gregor Wagner Date: Mon, 30 Sep 2013 10:38:05 -0700 Subject: [PATCH] Bug 771765, tentative bustage fix no. 2 on CLOSED TREE. r=bent --- dom/ipc/CrashReporterParent.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dom/ipc/CrashReporterParent.cpp b/dom/ipc/CrashReporterParent.cpp index ba4a732c8e5..7e4aaf14264 100644 --- a/dom/ipc/CrashReporterParent.cpp +++ b/dom/ipc/CrashReporterParent.cpp @@ -5,11 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "CrashReporterParent.h" #include "mozilla/dom/ContentParent.h" -#include "nsExceptionHandler.h" #include "nsXULAppAPI.h" - #include +#ifdef MOZ_CRASHREPORTER +#include "nsExceptionHandler.h" +#endif + using namespace base; namespace mozilla { @@ -35,6 +37,7 @@ mozilla::ipc::IProtocol* CrashReporterParent::CloneProtocol(Channel* aChannel, mozilla::ipc::ProtocolCloneContext* aCtx) { +#ifdef MOZ_CRASHREPORTER ContentParent* contentParent = aCtx->GetContentParent(); CrashReporter::ThreadId childThreadId = contentParent->Pid(); GeckoProcessType childProcessType = @@ -52,6 +55,10 @@ CrashReporterParent::CloneProtocol(Channel* aChannel, } return actor.forget(); +#else + MOZ_CRASH("Not Implemented"); + return nullptr; +#endif } CrashReporterParent::CrashReporterParent()