Changeset 3273 in kBuild for trunk/src/kmk

Timestamp:

Jan 4, 2019 12:48:51 AM (6 years ago)

Author:

bird

Message:

kmk: OS/2 build fixes

Location:

trunk/src/kmk

Files:

• function.c (modified) (1 diff)
• job.c (modified) (1 diff)
• kmkbuiltin.h (modified) (1 diff)
• makeint.h (modified) (1 diff)
• output.c (modified) (1 diff)

trunk/src/kmk/function.c

@@ -5326 +5326 @@
       if (rc != NO_ERROR)
         {
-          OSSN (error, (NILF, _("$(libpath): failed to set `%s' to `%s', rc=%d"), argv[0], buf, rc);
+          OSSN (error, NILF, _("$(libpath): failed to set `%s' to `%s', rc=%d"), argv[0], buf, rc);
           return variable_buffer_output (o, "", 0);
         }

trunk/src/kmk/job.c

@@ -3364 +3364 @@
 # ifdef __EMX__ /* is this necessary? */
     if (!unixy_shell && shellflags)
-      shellflags[0] = '/'; /* "/c" */
+      ((char *)shellflags)[0] = '/'; /* "/c" */
 # endif
 

trunk/src/kmk/kmkbuiltin.h

@@ -75 +75 @@
 #include "kbuild_version.h"
 #if !defined(KMK_BUILTIN_STANDALONE) && !defined(KWORKER)
-# include "../output.h"
+# include "output.h"
 #endif
 

trunk/src/kmk/makeint.h

@@ -651 +651 @@
 #define OSSSS(_t,_a,_f,_s1,_s2,_s3,_s4) _t((_a), strlen (_s1) + strlen (_s2) + strlen (_s3) + strlen (_s4), \
                                            (_f), (_s1), (_s2), (_s3), (_s4))        /* bird */
+#define OSSN(_t,_a,_f,_s1,_s2,_n)       _t((_a), strlen (_s1) + strlen (_s2) + INTSTR_LENGTH, \
+                                          (_f), (_s1), (_s2), (_n))                 /* bird */
 #define OSSNS(_t,_a,_f,_s1,_s2,_n,_s3) _t((_a), strlen (_s1) + strlen (_s2) + strlen (_s3) + INTSTR_LENGTH, \
                                           (_f), (_s1), (_s2), (_n), (_s3))          /* bird */

trunk/src/kmk/output.c

@@ -736 +736 @@
   /* "from" is opened by open_tmpfd, which does it in binary mode, so
      we need the mode of "to" to match that.  */
-  prev_mode = _setmode (fileno (to), _O_BINARY);
+  prev_mode = _setmode (fileno (to), O_BINARY);
 #endif