Changeset 2311 for trunk/src/kash/shinstance.c

Timestamp:

Mar 2, 2009, 1:46:13 AM (16 years ago)

Author:

bird

Message:

kash: darwin build fixes.

File:

• trunk/src/kash/shinstance.c (modified) (2 diffs)

trunk/src/kash/shinstance.c

@@ -38 +38 @@
 # include <pwd.h>
 #endif
+#include "shinstance.h"
+
 #if K_OS == K_OS_WINDOWS
 # include <Windows.h>
-#endif
-#include "shinstance.h"
-
-#if K_OS == K_OS_WINDOWS
 extern pid_t shfork_do_it(shinstance *psh); /* shforkA-win.asm */
 #endif
@@ -1065 +1063 @@
 
     if (!envp)
-        envp = sh_environ(psh);
+        envp = (const char * const *)sh_environ(psh);
 
 #if defined(SH_FORKED_MODE) && K_OS != K_OS_WINDOWS