commit ca33b6e875e7c250cbbdfc593fcce6572faa8e3e
author Daniel Dunbar <daniel@zuster.org> Fri Jan 27 08:43:26 2017 -0800
committer GitHub <noreply@github.com> Fri Jan 27 08:43:26 2017 -0800
tree 3ab2bebac471be6fc245223ffbbb4e69f3f70f83
parent bf6b19434479aabe6970e7209eff8eb3782a4204
parent 59e549188d15d492d29e55116bf814b684deb517

Merge pull request #100 from hughbe/sysconf-another

Fix another use of `sysconf` instead of platform independent c++ 11

lib/BuildSystem/LaneBasedExecutionQueue.cpp

diff --git a/lib/BuildSystem/LaneBasedExecutionQueue.cpp b/lib/BuildSystem/LaneBasedExecutionQueue.cpp
index 054a230..8dc1c76 100644
--- a/lib/BuildSystem/LaneBasedExecutionQueue.cpp
+++ b/lib/BuildSystem/LaneBasedExecutionQueue.cpp
@@ -43,9 +43,11 @@
 using namespace llbuild;
 using namespace llbuild::buildsystem;
 
+#if !defined(_WIN32)
 extern "C" {
   extern char **environ;
 }
+#endif
 
 namespace {
 
@@ -324,7 +326,7 @@
     std::vector<const char*> env(environment.size() + 1);
     char* const* envp = nullptr;
     if (environment.empty()) {
-      envp = ::environ;
+      envp = environ;
     } else {
       for (size_t i = 0; i != envStorage.size(); ++i) {
         env[i] = envStorage[i].c_str();

lib/Commands/NinjaBuildCommand.cpp

diff --git a/lib/Commands/NinjaBuildCommand.cpp b/lib/Commands/NinjaBuildCommand.cpp
index 8d3da41..e49a2b9 100644
--- a/lib/Commands/NinjaBuildCommand.cpp
+++ b/lib/Commands/NinjaBuildCommand.cpp
@@ -52,9 +52,11 @@
 using namespace llbuild::basic;
 using namespace llbuild::commands;
 
+#if !defined(_WIN32)
 extern "C" {
   extern char **environ;
 }
+#endif
 
 static uint64_t getTimeInMicroseconds() {
   llvm::sys::TimeValue now = llvm::sys::TimeValue::now();
@@ -1251,7 +1253,7 @@
 
         if (posix_spawn(&pid, args[0], /*file_actions=*/&fileActions,
                         /*attrp=*/&attributes, const_cast<char**>(args),
-                        ::environ) != 0) {
+                        environ) != 0) {
           context.emitError("unable to spawn process (%s)", strerror(errno));
           return false;
         }