diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
| commit | 329d35ab57451a668331667221eef7352ef04ef6 (patch) | |
| tree | e9cfdb38aa59f09c46df71a856de6ade171f380e /ipc/glue/GeckoChildProcessHost.cpp | |
| parent | d0da27ef572152d1fdd82a9ac15bd5c23ad68160 (diff) | |
| parent | cffb44547ae7997e5eaf71c644bd626eeb3bba00 (diff) | |
| download | UXP-2020.01.12.tar UXP-2020.01.12.tar.gz UXP-2020.01.12.tar.lz UXP-2020.01.12.tar.xz UXP-2020.01.12.zip | |
Merge branch 'release' into Basilisk-releasev2020.01.12
Diffstat (limited to 'ipc/glue/GeckoChildProcessHost.cpp')
| -rw-r--r-- | ipc/glue/GeckoChildProcessHost.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp index fee429238..ea76f85f0 100644 --- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -599,7 +599,7 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt // and passing wstrings from one config to the other is unsafe. So // we split the logic here. -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS) base::environment_map newEnvVars; ChildPrivileges privs = mPrivileges; if (privs == base::PRIVILEGES_DEFAULT) { @@ -744,7 +744,7 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt childArgv.push_back(childProcessType); base::LaunchApp(childArgv, mFileMap, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS) newEnvVars, privs, #endif false, &process, arch); |