--- ./xargs/xargs.c	Fri Oct  7 13:21:39 1994
+++ ../findutils-4.1/./xargs/xargs.c	Fri Jun  6 16:16:13 2003
@@ -83,8 +83,11 @@
 
 /* COMPAT:  SYSV version defaults size (and has a max value of) to 470.
    We try to make it as large as possible. */
-#if !defined(ARG_MAX) && defined(_SC_ARG_MAX)
-#define ARG_MAX sysconf (_SC_ARG_MAX)
+#if defined(_SC_ARG_MAX)
+# if defined(ARG_MAX)
+#    undef ARG_MAX
+# endif
+# define ARG_MAX sysconf (_SC_ARG_MAX)
 #endif
 #ifndef ARG_MAX
 #define ARG_MAX NCARGS
--- ./locate/locate.c	Mon Sep 26 18:06:14 1994
+++ ../findutils-4.1/./locate/locate.c	Fri Jun  6 16:22:24 2003
@@ -100,7 +100,7 @@
 get_short (fp)
      FILE *fp;
 {
-  register short x;
+  register unsigned short x;
 
   x = fgetc (fp);
   return (x << 8) | (fgetc (fp) & 0xff);