Changeset 2311 in kBuild

Timestamp:

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

Author:

bird

Message:

kash: darwin build fixes.

Location:

trunk/src/kash

Files:

• main.c (modified) (5 diffs)
• mknodes.sh (modified) (1 diff)
• shinstance.c (modified) (2 diffs)
• shtypes.h (modified) (1 diff)

trunk/src/kash/main.c

@@ -238 +238 @@
                 };
 #define SIGSSIZE (sizeof(sigs)/sizeof(sigs[0]))
-                int i;
+                unsigned i;
 
                 for (i = 0; i < SIGSSIZE; i++)
@@ -435 +435 @@
 
 STATIC const char *
-strip_argv0(const char *argv0, size_t *lenp)
+strip_argv0(const char *argv0, unsigned *lenp)
 {
         const char *tmp;
@@ -447 +447 @@
         if (!tmp)
                 tmp = strchr(argv0, '\0');
-        *lenp = tmp - argv0;
+        *lenp = (unsigned)(tmp - argv0);
         return argv0;
 }
@@ -454 +454 @@
 usage(const char *argv0)
 {
-        size_t len;
+        unsigned len;
         argv0 = strip_argv0(argv0, &len);
 
@@ -473 +473 @@
 version(const char *argv0)
 {
-        size_t len;
+        unsigned len;
         strip_argv0(argv0, &len);
 

trunk/src/kash/mknodes.sh

@@ -115 +115 @@
 echo
 echo
-echo "union node *copyfunc(union node *);"
-echo "void freefunc(union node *);"
+echo "union node *copyfunc(struct shinstance *, union node *);"
+echo "void freefunc(struct shinstance *, union node *);"
 
 exec <$nodes_pat

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

trunk/src/kash/shtypes.h

@@ -120 +120 @@
 #else
 # define SH_NORETURN_1
-# define SH_NORETURN_2 __attribute__((__noreturn__));
+# define SH_NORETURN_2 __attribute__((__noreturn__))
 #endif