Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Unified Diff: runtime/bin/process_macos.cc

Issue 866043003: Use MacOS helper to get address of environ variable (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/process_macos.cc
diff --git a/runtime/bin/process_macos.cc b/runtime/bin/process_macos.cc
index a6d9301b421cd5f83e0224e7135908aa873f9d50..3df775f568c933aa4a0d99a9d5a610083fdac2be 100644
--- a/runtime/bin/process_macos.cc
+++ b/runtime/bin/process_macos.cc
@@ -7,6 +7,7 @@
#include "bin/process.h"
+#include <crt_externs.h> // NOLINT
#include <errno.h> // NOLINT
#include <fcntl.h> // NOLINT
#include <poll.h> // NOLINT
@@ -24,8 +25,6 @@
#include "platform/signal_blocker.h"
-extern char **environ;
-
namespace dart {
namespace bin {
@@ -474,6 +473,9 @@ int Process::Start(const char* path,
}
if (program_environment != NULL) {
+ // On MacOS you have to do a bit of magic to get to the
+ // environment strings.
+ char** environ = *(_NSGetEnviron());
environ = program_environment;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698