Changeset 3141 for trunk/src/kmk/kmkbuiltin

Timestamp:

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

Author:

bird

Message:

kmk: linux merge fixes.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• append.c (modified) (1 diff)
• kDepObj.c (modified) (2 diffs)

trunk/src/kmk/kmkbuiltin/append.c

@@ -83 +83 @@
     int fVariables = 0;
     int fCommands = 0;
+#ifndef kmk_builtin_append
     int fLookForInserts = 0;
+#endif
 
     g_progname = argv[0];

trunk/src/kmk/kmkbuiltin/kDepObj.c

@@ -601 +601 @@
         if (off + sizeof(*pHdr) >= cbSyms)
         {
-            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbSyms=%#" KSIZE_PRI "\n",
+            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbSyms=%#" KX32_PRI "\n",
                     argv0, off, cbSyms);
             return 1; /* FIXME */
@@ -609 +609 @@
         if (off + cbData + sizeof(*pHdr) > cbSyms)
         {
-            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbData=%#" KX32_PRI " cbSyms=%#" KSIZE_PRI "\n",
+            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbData=%#" KX32_PRI " cbSyms=%#" KX32_PRI "\n",
                     argv0, off, cbData, cbSyms);
             return 1; /* FIXME */