about summary refs log tree commit diff
path: root/sunrpc
diff options
context:
space:
mode:
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/rpc/clnt.h2
-rw-r--r--sunrpc/rpc/pmap_clnt.h2
-rw-r--r--sunrpc/rpc/svc.h6
-rw-r--r--sunrpc/rpc/xdr.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/sunrpc/rpc/clnt.h b/sunrpc/rpc/clnt.h
index cf271c5c13..265bbe2528 100644
--- a/sunrpc/rpc/clnt.h
+++ b/sunrpc/rpc/clnt.h
@@ -405,7 +405,7 @@ extern char *clnt_sperrno (enum clnt_stat __num) __THROW;	/* string */
  * get the port number on the host for the rpc program,version and proto
  */
 extern int getrpcport (__const char * __host, u_long __prognum,
-		       u_long __versnum, u_int proto) __THROW;
+		       u_long __versnum, u_int __proto) __THROW;
 
 /*
  * get the local host's IP address without consulting
diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h
index 1b1c452915..997dddb323 100644
--- a/sunrpc/rpc/pmap_clnt.h
+++ b/sunrpc/rpc/pmap_clnt.h
@@ -45,7 +45,7 @@
 
 __BEGIN_DECLS
 
-typedef bool_t (*resultproc_t) (caddr_t resp, struct sockaddr_in *raddr);
+typedef bool_t (*resultproc_t) (caddr_t __resp, struct sockaddr_in *__raddr);
 
 /*
  * Usage:
diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
index 171231919a..f29615d5d0 100644
--- a/sunrpc/rpc/svc.h
+++ b/sunrpc/rpc/svc.h
@@ -82,11 +82,11 @@ struct SVCXPRT {
     enum xprt_stat (*xp_stat) (SVCXPRT *__xprt);
 				/* get transport status */
     bool_t	(*xp_getargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
-			       caddr_t args_ptr); /* get arguments */
+			       caddr_t __args_ptr); /* get arguments */
     bool_t	(*xp_reply) (SVCXPRT *__xprt, struct rpc_msg *__msg);
 				/* send reply */
     bool_t	(*xp_freeargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
-				caddr_t args_ptr);
+				caddr_t __args_ptr);
 				/* free mem allocated for args */
     void	(*xp_destroy) (SVCXPRT *__xprt);
 				/* destroy this struct */
@@ -226,7 +226,7 @@ extern void xprt_unregister (SVCXPRT *__xprt) __THROW;
  * deadlock the caller and server processes!
  */
 
-extern bool_t	svc_sendreply (SVCXPRT *xprt, xdrproc_t __xdr_results,
+extern bool_t	svc_sendreply (SVCXPRT *__xprt, xdrproc_t __xdr_results,
 			       caddr_t __xdr_location) __THROW;
 
 extern void	svcerr_decode (SVCXPRT *__xprt) __THROW;
diff --git a/sunrpc/rpc/xdr.h b/sunrpc/rpc/xdr.h
index ba9691d1af..75bc302980 100644
--- a/sunrpc/rpc/xdr.h
+++ b/sunrpc/rpc/xdr.h
@@ -316,7 +316,7 @@ extern bool_t xdr_opaque (XDR *__xdrs, caddr_t __cp, u_int __cnt) __THROW;
 extern bool_t xdr_string (XDR *__xdrs, char **__cpp, u_int __maxsize) __THROW;
 extern bool_t xdr_union (XDR *__xdrs, enum_t *__dscmp, char *__unp,
 			 __const struct xdr_discrim *__choices,
-			 xdrproc_t dfault) __THROW;
+			 xdrproc_t __dfault) __THROW;
 extern bool_t xdr_char (XDR *__xdrs, char *__cp) __THROW;
 extern bool_t xdr_u_char (XDR *__xdrs, u_char *__cp) __THROW;
 extern bool_t xdr_vector (XDR *__xdrs, char *__basep, u_int __nelem,