commit cdefe0aebc65dd4e5efbbbe74719c1bc886a7d31
author Reid Spencer <rspencer@reidspencer.com> Tue Dec 14 04:18:51 2004 +0000
committer Reid Spencer <rspencer@reidspencer.com> Tue Dec 14 04:18:51 2004 +0000
tree 9c08b837099477b1628c1bd9c2d504122debd183
parent c2e22fea42273eec68ce73d06a9e10fb38f79731

For PR351:
Implement the new environment pointer for ExecuteAndWait

llvm-svn: 18928

llvm/lib/System/Win32/Program.cpp

diff --git a/llvm/lib/System/Win32/Program.cpp b/llvm/lib/System/Win32/Program.cpp
index d6bd86a..4aff5e9 100644
--- a/llvm/lib/System/Win32/Program.cpp
+++ b/llvm/lib/System/Win32/Program.cpp
@@ -69,7 +69,8 @@
 //
 int 
 Program::ExecuteAndWait(const Path& path, 
-                        const std::vector<std::string>& args) {
+                        const std::vector<std::string>& args,
+                        const char** env) {
   if (!path.executable())
     throw path.toString() + " is not executable"; 
 
@@ -124,8 +125,9 @@
   PROCESS_INFORMATION pi;
   memset(&pi, 0, sizeof(pi));
 
+  LPVOID lpEnvironment = envp;
   if (!CreateProcess(path.c_str(), command, NULL, NULL, FALSE, 0,
-                     NULL, NULL, &si, &pi))
+                     lpEnvironment, NULL, &si, &pi))
   {
     ThrowError(std::string("Couldn't execute program '") + 
                path.toString() + "'");