From 937e72e1decb173de78d1dc73eeb85d0fac9c011 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Fri, 4 Nov 2011 15:13:58 -0400
Subject: [PATCH] Add MOZ_CRASHREPORTER ifdefs to the patch for bug 429592.
 r=captain bustage

--HG--
extra : rebase_source : 52d8221942a9be96dc76a546fbfa4c573331c1bf
---
 xpcom/threads/HangMonitor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xpcom/threads/HangMonitor.cpp b/xpcom/threads/HangMonitor.cpp
index e5edece43832..bbe2932dbbbc 100644
--- a/xpcom/threads/HangMonitor.cpp
+++ b/xpcom/threads/HangMonitor.cpp
@@ -38,10 +38,13 @@
 #include "mozilla/HangMonitor.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Preferences.h"
-#include "nsExceptionHandler.h"
 #include "nsXULAppAPI.h"
 #include "nsThreadUtils.h"
 
+#ifdef MOZ_CRASHREPORTER
+#include "nsExceptionHandler.h"
+#endif
+
 #ifdef XP_WIN
 #include <windows.h>
 #endif
@@ -100,8 +103,10 @@ Crash()
   }
 #endif
 
+#ifdef MOZ_CRASHREPORTER
   CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Hang"),
                                      NS_LITERAL_CSTRING("1"));
+#endif
 
   NS_RUNTIMEABORT("HangMonitor triggered");
 }