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

Unified Diff: runtime/bin/process_macos.cc

Issue 1174343006: Landing https://codereview.chromium.org/1171223003/ for Chinmay. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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 | « runtime/bin/platform_macos.cc ('k') | 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 6d628086f4a820596764cd4693bfa8e3d5702e49..8f2891fcd427ad4a0ddc0a95e4819470199fe539 100644
--- a/runtime/bin/process_macos.cc
+++ b/runtime/bin/process_macos.cc
@@ -7,7 +7,9 @@
#include "bin/process.h"
+#if !defined(TARGET_OS_IOS)
#include <crt_externs.h> // NOLINT
+#endif
#include <errno.h> // NOLINT
#include <fcntl.h> // NOLINT
#include <poll.h> // NOLINT
@@ -451,12 +453,14 @@ class ProcessStarter {
ReportChildError();
}
+#if !defined(TARGET_OS_IOS)
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_;
}
+#endif
VOID_TEMP_FAILURE_RETRY(
execvp(path_, const_cast<char* const*>(program_arguments_)));
« no previous file with comments | « runtime/bin/platform_macos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698