Changeset 1246 for trunk/src

Timestamp:

Oct 15, 2007, 6:54:59 PM (18 years ago)

Author:

bird

Message:

Solaris build fixes.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• cmp.c (modified) (1 diff)
• cp.c (modified) (2 diffs)
• solfakes.c (modified) (2 diffs)
• solfakes.h (modified) (2 diffs)

trunk/src/kmk/kmkbuiltin/cmp.c

@@ -65 +65 @@
 #endif
 #include <locale.h>
+#include "getopt.h"
 
 #ifndef O_BINARY

trunk/src/kmk/kmkbuiltin/cp.c

@@ -72 +72 @@
 #include <string.h>
 #include <unistd.h>
+#include "getopt.h"
 
 #ifdef _MSC_VER
@@ -610 +611 @@
                                 "   or: %s --version\n",
                         g_progname, g_progname, g_progname, g_progname);
-        return EX_USAGE;
+        return 1;
 }

trunk/src/kmk/kmkbuiltin/solfakes.c

@@ -27 +27 @@
 #include <stdarg.h>
 #include <stdlib.h>
-#ifdef __sun__
-# undef va_copy /* why? */
-#endif
 #include "solfakes.h"
 
@@ -62 +59 @@
         va_copy(va2, va);
         rc = snprintf(psz, cb, fmt, va2);
-        va_end(vaCopy);
+        va_end(va2);
 #else
         va2 = va;

trunk/src/kmk/kmkbuiltin/solfakes.h

@@ -27 +27 @@
 #ifdef __sun__
 
+#include <stdarg.h>
 #include "getopt.h"
 #define _PATH_DEVNULL "/dev/null"
@@ -37 +38 @@
 #endif
 
+int vasprintf(char **strp, const char *fmt, va_list va);
+int asprintf(char **strp, const char *fmt, ...);
+
 #endif /* __sun__ */
 #endif /* __solfakes_h__ */