X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Frun-program.c;h=ef9c51cb0f57d2e77d434b6790bcffd25c700602;hb=43c6634142a96e1d1bab2efe1a39cd8234903c41;hp=c91107441c2d28d5e812067b18bcddb1fd886e6b;hpb=2bfd703aaa0a56039b2831fcbc8f11739dc158b7;p=sbcl.git

diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c
index c911074..ef9c51c 100644
--- a/src/runtime/run-program.c
+++ b/src/runtime/run-program.c
@@ -193,7 +193,9 @@ int spawn(char *program, char *argv[], int sin, int sout, int serr,
         if (fd != channel[1]) close(fd);
 #endif
 
-    environ = envp;
+    if (envp) {
+      environ = envp;
+    }
     /* Exec the program. */
     if (search)
       execvp(program, argv);
@@ -291,9 +293,9 @@ HANDLE spawn (
 
     /* Spawn process given on the command line*/
     if (search)
-        hProcess = (HANDLE) spawnvp ( wait_mode, program, argv );
+        hProcess = (HANDLE) spawnvp ( wait_mode, program, (char* const* )argv );
     else
-        hProcess = (HANDLE) spawnv ( wait_mode, program, argv );
+        hProcess = (HANDLE) spawnv ( wait_mode, program, (char* const* )argv );
 
     /* Now that the process is launched, replace the original
      * in/out/err handles and close the backups. */