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

Timestamp:

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

Author:

bird

Message:

Solaris + cleanup.

File:

• trunk/src/gmake/kmkbuiltin/cp_utils.c (modified) (6 diffs)

trunk/src/gmake/kmkbuiltin/cp_utils.c

@@ -37 +37 @@
 
 #ifndef _MSC_VER
-#include <sys/param.h>
-#endif 
+# include <sys/param.h>
+#endif
 #include <sys/stat.h>
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
-#include <sys/mman.h>
+# include <sys/mman.h>
 #endif
 
@@ -47 +47 @@
 #include <errno.h>
 #include <fcntl.h>
-#ifndef _MSC_VER
 #include <fts.h>
-#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
-#ifndef _MSC_VER
 #include <sysexits.h>
 #include <unistd.h>
-#else
-#include "mscfakes.h"
-#include "ftsfake.h"
-#endif 
+
+#ifdef __sun__
+# include "solfakes.h"
+#endif
+#ifdef _MSC_VER
+# include "mscfakes.h"
+#endif
 
 #include "cp_extern.h"
@@ -74 +74 @@
 #ifndef S_ISVTX
 # define S_ISVTX 0
-#endif 
+#endif
 
 int
@@ -123 +123 @@
                         }
                 }
-                
+
                 if (fflag) {
                     /* remove existing destination file name,
@@ -169 +169 @@
                                                 entp->fts_path, to.p_path,
                                                 cp_pct(wtotal, fs->st_size));
-                                                
+
                                 }
                                 if (wcount >= (ssize_t)wresid || wcount <= 0)
@@ -199 +199 @@
                                                 entp->fts_path, to.p_path,
                                                 cp_pct(wtotal, fs->st_size));
-                                                
+
                                 }
                                 if (wcount >= (ssize_t)wresid || wcount <= 0)