Changeset 374 for trunk/src

Timestamp:

Dec 18, 2005, 5:30:55 AM (20 years ago)

Author:

bird

Message:

Made it build on OS/2.

File:

• trunk/src/gmake/kmkbuiltin/install.c (modified) (16 diffs)

trunk/src/gmake/kmkbuiltin/install.c

@@ -51 +51 @@
 #ifdef USE_MMAP
 #include <sys/mman.h>
-#endif 
+#endif
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <sys/time.h>
-#else
-#include <process.h>
 #endif
 #include <sys/stat.h>
@@ -68 +66 @@
 #include <paths.h>
 #include <pwd.h>
-#endif 
+#endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -77 +75 @@
 #else
 #include "mscfakes.h"
-#endif 
+#endif
+#if defined(__EMX__) || defined(_MSC_VER)
+# include <process.h>
+#endif
 
 extern void * setmode(const char *p);
@@ -84 +85 @@
 #ifndef __unused
 # define __unused
-#endif 
+#endif
 
 #ifndef MAXBSIZE
 # define MAXBSIZE 16384
-#endif 
+#endif
 
 /* Bootstrap aid - this doesn't exist in most older releases */
@@ -108 +109 @@
 #ifndef EFTYPE
 # define EFTYPE EINVAL
-#endif 
+#endif
 
 static gid_t gid;
@@ -126 +127 @@
 #ifdef USE_MMAP
 static int      trymmap(int);
-#endif 
+#endif
 static int      usage(void);
 
@@ -229 +230 @@
                         gid = gp->gr_gid;
                 else
-#endif 
+#endif
                 {
                         gid = (gid_t)numeric_id(group, "group");
@@ -244 +245 @@
                         uid = pp->pw_uid;
                 else
-#endif 
+#endif
                 {
                         uid = (uid_t)numeric_id(owner, "user");
@@ -335 +336 @@
 
         /* If try to install NULL file to a directory, fails. */
-        if (flags & DIRECTORY 
+        if (flags & DIRECTORY
 #if defined(__EMX__) || defined(_MSC_VER)
             || (   stricmp(from_name, _PATH_DEVNULL)
@@ -341 +342 @@
 #ifdef __EMX__
                 && stricmp(from_name, "/dev/nul")
-#endif 
+#endif
                )
 #else
@@ -427 +428 @@
 
         if (dostrip) {
-#if defined(__EMX__) || defined(_MSC_VER) 
+#if defined(__EMX__) || defined(_MSC_VER)
                 /* close before we strip. */
                 close(to_fd);
                 to_fd = -1;
-#endif 
+#endif
                 rc = strip(tempcopy ? tempfile : to_name);
                 if (rc)
@@ -440 +441 @@
                  * that does not work in-place -- like GNU binutils strip.
                  */
-#if !defined(__EMX__) && !defined(_MSC_VER) 
+#if !defined(__EMX__) && !defined(_MSC_VER)
                 close(to_fd);
-#endif 
+#endif
                 to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY | O_BINARY, 0);
                 if (to_fd < 0) {
@@ -484 +485 @@
                                 tvb[1].tv_usec = 0;
                                 (void)utimes(tempfile, tvb);
-                        } else 
+                        } else
 #endif
                         {
@@ -866 +867 @@
                 }
         }
-#endif 
+#endif
 }
 
@@ -908 +909 @@
  *      print a usage message and die
  */
-static int 
+static int
 usage()
 {
@@ -943 +944 @@
         return (0);
 }
-#endif 
+#endif