head 1.2; access; symbols pkgsrc-2014Q1:1.1.1.1.0.18 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.16 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.14 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.12 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.10 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.8 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.6 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.4 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.2 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @// @; 1.2 date 2014.06.11.12.36.16; author joerg; state dead; branches; next 1.1; commitid XezNXGnjQIlDq6Ex; 1.1 date 2012.03.15.09.45.29; author ryoon; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2012.03.15.09.45.29; author ryoon; state Exp; branches; next ; desc @@ 1.2 log @Retire old thunderbird versions. @ text @$NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/15 09:45:29 ryoon Exp $ --- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig 2012-02-16 10:25:01.000000000 +0000 +++ mozilla/ipc/glue/GeckoChildProcessHost.cpp @@@@ -430,7 +430,7 @@@@ GeckoChildProcessHost::PerformAsyncLaunc // and passing wstrings from one config to the other is unsafe. So // we split the logic here. -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) base::environment_map newEnvVars; // XPCOM may not be initialized in some subprocesses. We don't want // to initialize XPCOM just for the directory service, especially @@@@ -445,8 +445,8 @@@@ GeckoChildProcessHost::PerformAsyncLaunc if (NS_SUCCEEDED(rv)) { nsCString path; greDir->GetNativePath(path); -# ifdef OS_LINUX -# ifdef ANDROID +# if defined(OS_LINUX) || defined(OS_BSD) +# if defined(ANDROID) || defined(OS_BSD) path += "/lib"; # endif // ANDROID const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); @@@@ -557,7 +557,7 @@@@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(pidstring); #if defined(MOZ_CRASHREPORTER) -# if defined(OS_LINUX) +# if defined(OS_LINUX) || defined(OS_BSD) int childCrashFd, childCrashRemapFd; if (!CrashReporter::CreateNotificationPipeForChild( &childCrashFd, &childCrashRemapFd)) @@@@ -594,7 +594,7 @@@@ GeckoChildProcessHost::PerformAsyncLaunc #endif base::LaunchApp(childArgv, mFileMap, -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) newEnvVars, #endif false, &process, arch); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/10 11:42:39 ryoon Exp $ @ 1.1.1.1 log @Import thunderbird10-10.0.3 as mail/thunderbird10 * This is ESR (Extended Support Release) version. * Fix security bugs @ text @@