From abe115cd907e1ea2eb1a7558ae8cf62fd3e407b8 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Mon, 19 Apr 1993 07:39:27 +0000
Subject: [PATCH] Cleanup for GCC 2.

---
 usr.bin/printf/printf.c   | 3 ++-
 usr.bin/rdist/defs.h      | 1 +
 usr.bin/rdist/expand.c    | 3 +--
 usr.bin/rpcinfo/rpcinfo.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index a64e4d4c4d2c..055ad0c91714 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -43,6 +43,7 @@ static char sccsid[] = "@(#)printf.c	5.9 (Berkeley) 6/1/90";
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 
 #define PF(f, func) { \
 	if (fieldwidth) \
@@ -65,7 +66,7 @@ main(argc, argv)
 	static char *skip1, *skip2;
 	register char *format, *fmt, *start;
 	register int end, fieldwidth, precision;
-	char convch, nextch, *getstr(), *index(), *mklong();
+	char convch, nextch, *getstr(), *mklong();
 	double getdouble();
 	long getlong();
 
diff --git a/usr.bin/rdist/defs.h b/usr.bin/rdist/defs.h
index d39da0f6bfe2..42c249ac77b9 100644
--- a/usr.bin/rdist/defs.h
+++ b/usr.bin/rdist/defs.h
@@ -41,6 +41,7 @@
 #include <netinet/in.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index d3c0e9e7a964..11d8def0bbf4 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -57,8 +57,7 @@ int	expany;		/* any expansions done? */
 char	*entp;
 char	**sortbase;
 
-char	*index();
-int	argcmp();
+static int	argcmp();
 
 #define sort()	qsort((char *)sortbase, &eargv[eargc] - sortbase, \
 		      sizeof(*sortbase), argcmp), sortbase = &eargv[eargc]
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 961f9b0b2d75..760c0ec55c10 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -53,7 +53,7 @@ static	char sccsid[] = "@(#)rpcinfo.c 1.22 87/08/12 SMI";
 #define MAXHOSTLEN 256
 
 #define	MIN_VERS	((u_long) 0)
-#define	MAX_VERS	((u_long) 4294967295L)
+#define	MAX_VERS	((u_long) 4294967295UL)
 
 static void	udpping(/*u_short portflag, int argc, char **argv*/);
 static void	tcpping(/*u_short portflag, int argc, char **argv*/);