Back out 63105f3adf34 (bug 721843) for xpcshell timeouts
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 01 Oct 2012 20:43:27 -0700
changeset 108966 c1ac587a1ccbdc793b5bcdbd7ae27ab80aa0298f
parent 108965 d51aa340d3e20a9911fbdfb2981fdc81cfb8308e
child 108967 ba388025ede9aa7321034c903fc36002ba791e87
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
bugs721843
milestone18.0a1
backs out63105f3adf347e4bf82385ac9a83addeb6514397
Back out 63105f3adf34 (bug 721843) for xpcshell timeouts
toolkit/xre/nsSigHandlers.cpp
--- a/toolkit/xre/nsSigHandlers.cpp
+++ b/toolkit/xre/nsSigHandlers.cpp
@@ -38,17 +38,17 @@
 
 static char _progname[1024] = "huh?";
 static unsigned int _gdb_sleep_duration = 300;
 
 // NB: keep me up to date with the same variable in
 // ipc/chromium/chrome/common/ipc_channel_posix.cc
 static const int kClientChannelFd = 3;
 
-#if (defined(LINUX) || defined(XP_MACOSX)) && \
+#if defined(LINUX) && defined(DEBUG) && \
       (defined(__i386) || defined(__x86_64) || defined(PPC))
 #define CRAWL_STACK_ON_SIGSEGV
 #endif
 
 #if defined(CRAWL_STACK_ON_SIGSEGV)
 
 #include <unistd.h>
 #include "nsISupportsUtils.h"
@@ -220,18 +220,17 @@ void InstallSignalHandlers(const char *P
   {
     unsigned int s;
     if (1 == sscanf(gdbSleep, "%u", &s)) {
       _gdb_sleep_duration = s;
     }
   }
 
 #if defined(CRAWL_STACK_ON_SIGSEGV)
-  if (!getenv("XRE_NO_WINDOWS_CRASH_DIALOG") &&
-      !getenv("MOZ_CRASHREPORTER")) {
+  if (!getenv("XRE_NO_WINDOWS_CRASH_DIALOG")) {
     void (*crap_handler)(int) =
       GeckoProcessType_Default != XRE_GetProcessType() ?
           child_ah_crap_handler :
           ah_crap_handler;
     signal(SIGSEGV, crap_handler);
     signal(SIGILL, crap_handler);
     signal(SIGABRT, crap_handler);
   }