Changeset 809 for trunk/src/gmake/kmkbuiltin/cat.c

Timestamp:

Jan 29, 2007, 6:54:36 AM (18 years ago)

Author:

bird

Message:

Solaris + cleanup.

File:

• trunk/src/gmake/kmkbuiltin/cat.c (modified) (4 diffs)

trunk/src/gmake/kmkbuiltin/cat.c

@@ -49 +49 @@
 #else
 #define NO_UDOM_SUPPORT /* kmk */
-#endif 
+#endif
 
 #ifndef _MSC_VER
-#include <sys/param.h>
+# include <sys/param.h>
 #endif
 #include <sys/stat.h>
 #ifndef NO_UDOM_SUPPORT
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>
+# include <sys/socket.h>
+# include <sys/un.h>
+# include <errno.h>
 #endif
 
@@ -68 +68 @@
 #include <stdlib.h>
 #include <string.h>
-#ifndef _MSC_VER
 #include <unistd.h>
-#else
-#include "mscfakes.h"
-#endif 
 #include <stddef.h>
+
+#ifdef __sun__
+# include "solfakes.h"
+#endif
+#ifdef _MSC_VER
+# include "mscfakes.h"
+#endif
 
 int bflag, eflag, nflag, sflag, tflag, vflag;
@@ -111 +114 @@
 #ifdef kmk_builtin_cat /* kmk did this already. */
         setlocale(LC_CTYPE, "");
-#endif 
+#endif
 
         while ((ch = getopt(argc, argv, "benstuv")) != -1)
@@ -285 +288 @@
 #else
                 bsize = MAX(sbuf.st_blksize, 1024);
-#endif 
+#endif
                 if ((buf = malloc(bsize)) == NULL)
                         return err(1, "buffer");