Changeset 714 for trunk/src/gmake/kmkbuiltin/mv.c

Timestamp:

Dec 14, 2006, 2:38:40 AM (19 years ago)

Author:

bird

Message:

made it build on OS/2.

File:

• trunk/src/gmake/kmkbuiltin/mv.c (modified) (9 diffs)

trunk/src/gmake/kmkbuiltin/mv.c

@@ -45 +45 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $");
-#endif 
+#endif
 
 #include <sys/types.h>
 #ifndef _MSC_VER
+#ifndef __OS2__
 #include <sys/acl.h>
+#endif
 #include <sys/param.h>
 #include <sys/time.h>
@@ -62 +64 @@
 #ifndef _MSC_VER
 #include <grp.h>
-#endif 
+#endif
 #include <limits.h>
 #ifndef _MSC_VER
 #include <paths.h>
 #include <pwd.h>
-#endif 
+#endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -88 +90 @@
 static int      fastcopy(char *, char *, struct stat *);
 static int      copy(char *, char *);
-#endif 
+#endif
 static int      usage(void);
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-static const char *user_from_uid(unsigned long id, int x)
+# ifdef __OS2__
+static
+# endif
+const char *user_from_uid(uid_t id, int x)
 {
         static char s_buf[64];
@@ -98 +103 @@
         return s_buf;
 }
-static const char *group_from_gid(unsigned long id, int x)
+# ifdef __OS2__
+static
+# endif
+const char *group_from_gid(gid_t id, int x)
 {
         static char s_buf[64];
@@ -178 +186 @@
 #else
         if (!baselen || *(endp - 1) != '/') {
-#endif 
+#endif
                 *endp++ = '/';
                 ++baselen;
@@ -198 +206 @@
                 while (p != *argv && p[-1] != '/')
                         --p;
-#endif 
+#endif
 
                 if ((baselen + (len = strlen(p))) >= PATH_MAX) {
@@ -273 +281 @@
                 }
         }
-#endif 
+#endif
 
         if (errno == EXDEV) {
@@ -303 +311 @@
                         }
                 }
-#endif 
+#endif
         } else {
                 warn("rename %s to %s", from, to);
@@ -321 +329 @@
         return (S_ISREG(sb.st_mode) ?
             fastcopy(from, to, &sb) : copy(from, to));
-#endif 
+#endif
 }