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