зеркало из https://github.com/mozilla/pjs.git
bug 521324: call the multi-threaded GLib initialization function. r=karlt
This commit is contained in:
Родитель
b6aff83bd0
Коммит
cf6e6c5c18
|
@ -349,7 +349,7 @@ RPCChannel::DebugAbort(const char* file, int line, const char* cond,
|
|||
const char* type, bool reply)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"[RPCChannel][%s][%s:%d] "
|
||||
"###!!! [RPCChannel][%s][%s:%d] "
|
||||
"Assertion (%s) failed. %s (triggered by %s%s)\n",
|
||||
mChild ? "Child" : "Parent",
|
||||
file, line, cond,
|
||||
|
|
|
@ -40,6 +40,9 @@
|
|||
#include "nsXULAppAPI.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#if defined(MOZ_WIDGET_GTK2)
|
||||
#include <glib.h>
|
||||
#endif
|
||||
|
||||
#include "prenv.h"
|
||||
|
||||
|
@ -257,6 +260,10 @@ XRE_InitChildProcess(int aArgc,
|
|||
NS_ENSURE_ARG_POINTER(aArgv);
|
||||
NS_ENSURE_ARG_POINTER(aArgv[0]);
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK2)
|
||||
g_thread_init(NULL);
|
||||
#endif
|
||||
|
||||
if (PR_GetEnv("MOZ_DEBUG_CHILD_PROCESS")) {
|
||||
#ifdef OS_POSIX
|
||||
printf("\n\nCHILDCHILDCHILDCHILD\n debug me @%d\n\n", getpid());
|
||||
|
|
Загрузка…
Ссылка в новой задаче