Bustage fix: work around XRE hackery.
authorChris Jones <jones.chris.g@gmail.com>
Tue, 12 Jan 2010 17:42:58 -0600
changeset 37205 8c002da7e8cf7e7b88184e6f731302ea2948f3a0
parent 37204 76bd5fa371deb14e71894858482981a9e9743aa0
child 37206 e828ac5006650b19def0b3b35cca72b80ef46548
push idunknown
push userunknown
push dateunknown
milestone1.9.3a1pre
Bustage fix: work around XRE hackery.
ipc/app/MozillaRuntimeMain.cpp
xpcom/build/nsXULAppAPI.h
--- a/ipc/app/MozillaRuntimeMain.cpp
+++ b/ipc/app/MozillaRuntimeMain.cpp
@@ -65,17 +65,17 @@ main(int argc, char* argv[])
     // disabled.
     if (0 != strcmp("-", crashReporterArg)
         && !XRE_SetRemoteExceptionHandler(crashReporterArg))
         return 1;
 #  elif defined(OS_LINUX)
     // on POSIX, |crashReporterArg| is "true" if crash reporting is
     // enabled, false otherwise
     if (0 != strcmp("false", crashReporterArg)
-        && !XRE_SetRemoteExceptionHandler())
+        && !XRE_SetRemoteExceptionHandler(NULL))
         return 1;
 #  else
 #    error "OOP crash reporting unsupported on this platform"
 #  endif   
 #endif // if defined(MOZ_CRASHREPORTER)
 
 #if defined(XP_WIN) && defined(DEBUG_bent)
     MessageBox(NULL, L"Hi", L"Hi", MB_OK);
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -446,17 +446,17 @@ PR_STATIC_ASSERT(sizeof(kGeckoProcessTyp
 XRE_API(const char*,
         XRE_ChildProcessTypeToString, (GeckoProcessType aProcessType))
 
 XRE_API(GeckoProcessType,
         XRE_StringToChildProcessType, (const char* aProcessTypeString))
 
 #if defined(MOZ_CRASHREPORTER)
 XRE_API(PRBool,
-        XRE_SetRemoteExceptionHandler, (const char* aPipe=0))
+        XRE_SetRemoteExceptionHandler, (const char* aPipe))
 #endif
 
 XRE_API(nsresult,
         XRE_InitChildProcess, (int aArgc,
                                char* aArgv[],
                                GeckoProcessType aProcess))
 
 XRE_API(GeckoProcessType,