diff options
Diffstat (limited to 'www/libxul/files/patch-bug1233275')
| -rw-r--r-- | www/libxul/files/patch-bug1233275 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/www/libxul/files/patch-bug1233275 b/www/libxul/files/patch-bug1233275 index e99e86a74ce0..ac5d9d2cdedb 100644 --- a/www/libxul/files/patch-bug1233275 +++ b/www/libxul/files/patch-bug1233275 @@ -3,23 +3,19 @@ diff --git a/ipc/chromium/src/base/process_util_bsd.cc b/ipc/chromium/src/base/process_util_bsd.cc --- ipc/chromium/src/base/process_util_bsd.cc +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -13,6 +13,7 @@ +@@ -12,10 +12,9 @@ #include <string> +#include "nspr.h" #include "base/eintr_wrapper.h" - #include "base/file_util.h" - #include "base/logging.h" -@@ -48,7 +49,6 @@ - #ifdef HAVE_POSIX_SPAWN - #include <spawn.h> --extern "C" char **environ __dso_public; - #endif +-extern "C" char **environ __attribute__((__visibility__("default"))); +- + namespace base { - namespace { -@@ -114,6 +114,7 @@ bool LaunchApp(const std::vector<std::st + void FreeEnvVarsArray(char* array[], int length) +@@ -66,6 +65,7 @@ bool LaunchApp(const std::vector<std::st // Existing variables are overwritten by env_vars_to_set. int pos = 0; environment_map combined_env_vars = env_vars_to_set; @@ -27,7 +23,7 @@ diff --git a/ipc/chromium/src/base/process_util_bsd.cc b/ipc/chromium/src/base/p while(environ[pos] != NULL) { std::string varString = environ[pos]; std::string varName = varString.substr(0, varString.find_first_of('=')); -@@ -121,8 +122,9 @@ bool LaunchApp(const std::vector<std::st +@@ -73,8 +73,9 @@ bool LaunchApp(const std::vector<std::st if (combined_env_vars.find(varName) == combined_env_vars.end()) { combined_env_vars[varName] = varValue; } |