From 88b30ea68c4a882592e337efe725a4f4ab0821c8 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 26 Oct 2003 05:51:51 +0000
Subject: [PATCH] Make this compile cleanly.  Switch to using rpcgen to
 generate code that can be compiled on an ansi-C compiler, so that it puts the
 xdrproc_t casts in.  This also implies a slight function name change.

---
 usr.sbin/bootparamd/bootparamd/Makefile     | 6 +++---
 usr.sbin/bootparamd/bootparamd/bootparamd.c | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index d3122888538f..11c639048a12 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -13,12 +13,12 @@ CLEANFILES= ${GENSRCS}
 RPCSRC=	${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
 
 bootparam_prot_svc.c: ${RPCSRC}
-	rpcgen -m -o ${.TARGET} ${RPCSRC}
+	rpcgen -C -m -o ${.TARGET} ${RPCSRC}
 
 bootparam_prot_xdr.c: ${RPCSRC}
-	rpcgen -c -o ${.TARGET} ${RPCSRC}
+	rpcgen -C -c -o ${.TARGET} ${RPCSRC}
 
 bootparam_prot.h: ${RPCSRC}
-	rpcgen -h -o ${.TARGET} ${RPCSRC}
+	rpcgen -C -h -o ${.TARGET} ${RPCSRC}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 80fbe70ff939..159124e008ad 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -42,8 +42,9 @@ int getthefile __P((char *, char *, char *, int));
 int checkhost __P((char *, char *, int));
 
 bp_whoami_res *
-bootparamproc_whoami_1(whoami)
+bootparamproc_whoami_1_svc(whoami, req)
 bp_whoami_arg *whoami;
+struct svc_req *req;
 {
   long haddr;
   static bp_whoami_res res;
@@ -107,8 +108,9 @@ bp_whoami_arg *whoami;
 
 
 bp_getfile_res *
-  bootparamproc_getfile_1(getfile)
+  bootparamproc_getfile_1_svc(getfile, req)
 bp_getfile_arg *getfile;
+struct svc_req *req;
 {
   char *where, *index();
   static bp_getfile_res res;