Changeset 3141 for trunk/src/kmk/job.c

Timestamp:

Mar 14, 2018, 10:58:32 PM (7 years ago)

Author:

bird

Message:

kmk: linux merge fixes.

File:

• trunk/src/kmk/job.c (modified) (3 diffs)

trunk/src/kmk/job.c

@@ -1085 +1085 @@
   if (!jobserver_tokens)
     ONS (fatal, NILF, "INTERNAL: Freeing child %p (%s) but no tokens left!\n",
-         child, child->file->name);
+         (void *)child, child->file->name);
 
   /* If we're using the jobserver and this child is not the only outstanding
@@ -1174 +1174 @@
 #else
   char **argv;
-# if !defined(__MSDOS__) && !defined(_AMIGA) && !defined(WINDOWS32) && !defined(VMS)
-  char ** volatile volatile_argv;
-  int volatile volatile_flags;
-# endif
 #endif
 
@@ -2800 +2796 @@
   static const char *sh_chars_sh =  "#;\"*?[]&|<>(){}$`^~!";
 # endif  /* HAVE_DOS_PATHS */
-  char*  sh_chars = sh_chars_sh;                                                /* kmk: +_sh */
-  char** sh_cmds = sh_cmds_sh;                                                  /* kmk: +_sh */
+  char const *  sh_chars = sh_chars_sh;                                                /* kmk: +_sh +const */
+  char const * const * sh_cmds = sh_cmds_sh;                                           /* kmk: +_sh +const*2 */
 #endif
 #ifdef KMK
-  static char sh_chars_kash[] = "#;*?[]&|<>(){}$`^~!";                          /* note: no \" - good idea? */
-  static char *sh_cmds_kash[] = {
+  static const char sh_chars_kash[] = "#;*?[]&|<>(){}$`^~!";                          /* note: no \" - good idea? */
+  static const char * const sh_cmds_kash[] = {
       ".", ":", "break", "case", "cd", "continue", "echo", "eval", "exec", "exit", 
       "export", "for", "if", "login", "logout", "read", "readonly", "set",