Breath deep and take __P out of the system include files.

# This appears to not break X11, but I'm having problems compiling the
# glide part of the server with or without this patch, so I can't tell
# for sure.

20 files changed, 265 insertions, 285 deletions

diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index ce20370..4f23e5e 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -155,11 +155,7 @@ union des_block {
 };
 typedef union des_block des_block;
 __BEGIN_DECLS
-#ifdef __STDC__
 extern bool_t xdr_des_block(XDR *, des_block *);
-#else
-extern bool_t xdr_des_block();
-#endif
 __END_DECLS
 
 /*
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index 964e774..fff4ebf 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -111,7 +111,7 @@ struct authdes_verf {
  *
  */
 __BEGIN_DECLS
-extern int authdes_getucred __P(( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * ));
+extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
 __END_DECLS
 
 __BEGIN_DECLS
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 57e075b..48373b2 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -69,7 +69,7 @@ struct authunix_parms {
 #define authsys_parms authunix_parms
 
 __BEGIN_DECLS
-extern bool_t xdr_authunix_parms __P((XDR *, struct authunix_parms *));
+extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
 __END_DECLS
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index f8af9a2..6cb7c36 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -97,22 +97,22 @@ typedef struct __rpc_client {
 	AUTH	*cl_auth;			/* authenticator */
 	struct clnt_ops {
 		/* call remote procedure */
-		enum clnt_stat	(*cl_call) __P((struct __rpc_client *,
+		enum clnt_stat	(*cl_call)(struct __rpc_client *,
 				    rpcproc_t, xdrproc_t, caddr_t, xdrproc_t,
-					caddr_t, struct timeval));
+					caddr_t, struct timeval);
 		/* abort a call */
-		void		(*cl_abort) __P((struct __rpc_client *));
+		void		(*cl_abort)(struct __rpc_client *);
 		/* get specific error code */
-		void		(*cl_geterr) __P((struct __rpc_client *,
-					struct rpc_err *));
+		void		(*cl_geterr)(struct __rpc_client *,
+					struct rpc_err *);
 		/* frees results */
-		bool_t		(*cl_freeres) __P((struct __rpc_client *,
-					xdrproc_t, caddr_t));
+		bool_t		(*cl_freeres)(struct __rpc_client *,
+					xdrproc_t, caddr_t);
 		/* destroy this structure */
-		void		(*cl_destroy) __P((struct __rpc_client *));
+		void		(*cl_destroy)(struct __rpc_client *);
 		/* the ioctl() of rpc */
-		bool_t          (*cl_control) __P((struct __rpc_client *, u_int,
-				    char *));
+		bool_t          (*cl_control)(struct __rpc_client *, u_int,
+				    char *);
 	} *cl_ops;
 	void 			*cl_private;	/* private stuff */
 	char			*cl_netid;	/* network token */
@@ -274,8 +274,8 @@ struct rpc_timers {
  *	const char *prot;	-- protocol
  */
 __BEGIN_DECLS
-extern CLIENT *clnt_create __P((const char *, const rpcprog_t, const rpcvers_t,
-				const char *));
+extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t,
+			   const char *);
 /*
  *
  * 	const char *hostname;			-- hostname
@@ -288,9 +288,9 @@ extern CLIENT *clnt_create __P((const char *, const rpcprog_t, const rpcvers_t,
  * Generic client creation routine. Supported protocols are which belong
  * to the nettype name space.
  */
-extern CLIENT *clnt_create_vers __P((const char *, const rpcprog_t, rpcvers_t *,
-				     const rpcvers_t, const rpcvers_t,
-				     const char *));
+extern CLIENT *clnt_create_vers(const char *, const rpcprog_t, rpcvers_t *,
+				const rpcvers_t, const rpcvers_t,
+				const char *);
 /*
  *	const char *host;		-- hostname
  *	const rpcprog_t prog;		-- program number
@@ -305,8 +305,8 @@ extern CLIENT *clnt_create_vers __P((const char *, const rpcprog_t, rpcvers_t *,
  * Generic client creation routine. It takes a netconfig structure
  * instead of nettype
  */
-extern CLIENT *clnt_tp_create __P((const char *, const rpcprog_t,
-				   const rpcvers_t, const struct netconfig *));
+extern CLIENT *clnt_tp_create(const char *, const rpcprog_t,
+			      const rpcvers_t, const struct netconfig *);
 /*
  *	const char *hostname;			-- hostname
  *	const rpcprog_t prog;			-- program number
@@ -318,9 +318,9 @@ extern CLIENT *clnt_tp_create __P((const char *, const rpcprog_t,
  * Generic TLI create routine. Only provided for compatibility.
  */
 
-extern CLIENT *clnt_tli_create __P((const int, const struct netconfig *,
-				    const struct netbuf *, const rpcprog_t,
-				    const rpcvers_t, const u_int, const u_int));
+extern CLIENT *clnt_tli_create(const int, const struct netconfig *,
+			       const struct netbuf *, const rpcprog_t,
+			       const rpcvers_t, const u_int, const u_int);
 /*
  *	const register int fd;		-- fd
  *	const struct netconfig *nconf;	-- netconfig structure
@@ -334,14 +334,14 @@ extern CLIENT *clnt_tli_create __P((const int, const struct netconfig *,
 /*
  * Low level clnt create routine for connectionful transports, e.g. tcp.
  */
-extern CLIENT *clnt_vc_create __P((const int, const struct netbuf *,
-				   const rpcprog_t, const rpcvers_t,
-				   const u_int, const u_int));
+extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
+			      const rpcprog_t, const rpcvers_t,
+			      const u_int, const u_int);
 /*
  * Added for compatibility to old rpc 4.0. Obsoleted by clnt_vc_create().
  */
-extern CLIENT *clntunix_create  __P((struct sockaddr_un *,
-				     u_long, u_long, int *, u_int, u_int));
+extern CLIENT *clntunix_create(struct sockaddr_un *,
+			       u_long, u_long, int *, u_int, u_int);
 /*
  *	const int fd;				-- open file descriptor
  *	const struct netbuf *svcaddr;		-- servers address
@@ -354,9 +354,9 @@ extern CLIENT *clntunix_create  __P((struct sockaddr_un *,
 /*
  * Low level clnt create routine for connectionless transports, e.g. udp.
  */
-extern CLIENT *clnt_dg_create __P((const int, const struct netbuf *,
-				   const rpcprog_t, const rpcvers_t,
-				   const u_int, const u_int));
+extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
+			      const rpcprog_t, const rpcvers_t,
+			      const u_int, const u_int);
 /*
  *	const int fd;				-- open file descriptor
  *	const struct netbuf *svcaddr;		-- servers address
@@ -373,7 +373,7 @@ extern CLIENT *clnt_dg_create __P((const int, const struct netbuf *,
  *	u_long prog;
  *	u_long vers;
  */
-extern CLIENT *clnt_raw_create	__P((rpcprog_t, rpcvers_t));
+extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
 
 __END_DECLS
 
@@ -382,24 +382,24 @@ __END_DECLS
  * Print why creation failed
  */
 __BEGIN_DECLS
-extern void clnt_pcreateerror	__P((const char *));			/* stderr */
-extern char *clnt_spcreateerror	__P((const char *));			/* string */
+extern void clnt_pcreateerror(const char *);			/* stderr */
+extern char *clnt_spcreateerror(const char *);			/* string */
 __END_DECLS
 
 /*
  * Like clnt_perror(), but is more verbose in its output
  */
 __BEGIN_DECLS
-extern void clnt_perrno		__P((enum clnt_stat));		/* stderr */
-extern char *clnt_sperrno	__P((enum clnt_stat));		/* string */
+extern void clnt_perrno(enum clnt_stat);		/* stderr */
+extern char *clnt_sperrno(enum clnt_stat);		/* string */
 __END_DECLS
 
 /*
  * Print an English error message, given the client error code
  */
 __BEGIN_DECLS
-extern void clnt_perror		__P((CLIENT *, const char *));	 	/* stderr */
-extern char *clnt_sperror	__P((CLIENT *, const char *));		/* string */
+extern void clnt_perror(CLIENT *, const char *);	 	/* stderr */
+extern char *clnt_sperror(CLIENT *, const char *);		/* string */
 __END_DECLS
 
 
@@ -413,7 +413,7 @@ struct rpc_createerr {
 
 #ifdef _THREAD_SAFE
 __BEGIN_DECLS
-extern struct rpc_createerr	*__rpc_createerr __P((void));
+extern struct rpc_createerr	*__rpc_createerr(void);
 __END_DECLS
 #define rpc_createerr		(*(__rpc_createerr()))
 #else
@@ -434,10 +434,10 @@ extern struct rpc_createerr rpc_createerr;
  *	const char *nettype;
  */
 __BEGIN_DECLS
-extern enum clnt_stat rpc_call __P((const char *, const rpcprog_t,
-				    const rpcvers_t, const rpcproc_t,
-				    const xdrproc_t, const char *,
-				    const xdrproc_t, char *, const char *));
+extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
+			       const rpcvers_t, const rpcproc_t,
+			       const xdrproc_t, const char *,
+			       const xdrproc_t, char *, const char *);
 __END_DECLS
 
 /*
@@ -484,18 +484,18 @@ __END_DECLS
  *	const char		*nettype;	-- Transport type
  */
 
-typedef bool_t (*resultproc_t) __P((caddr_t, ...));
+typedef bool_t (*resultproc_t)(caddr_t, ...);
 
 __BEGIN_DECLS
-extern enum clnt_stat rpc_broadcast __P((const rpcprog_t, const rpcvers_t,
-					 const rpcproc_t, const xdrproc_t,
-					 caddr_t, const xdrproc_t, caddr_t,
-					 const resultproc_t, const char *));
-extern enum clnt_stat rpc_broadcast_exp __P((const rpcprog_t, const rpcvers_t,
-					     const rpcproc_t, const xdrproc_t,
-					     caddr_t, const xdrproc_t, caddr_t,
-					     const resultproc_t, const int,
-					     const int, const char *));
+extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
+				    const rpcproc_t, const xdrproc_t,
+				    caddr_t, const xdrproc_t, caddr_t,
+				    const resultproc_t, const char *);
+extern enum clnt_stat rpc_broadcast_exp(const rpcprog_t, const rpcvers_t,
+					const rpcproc_t, const xdrproc_t,
+					caddr_t, const xdrproc_t, caddr_t,
+					const resultproc_t, const int,
+					const int, const char *);
 __END_DECLS
 
 /* For backward compatibility */
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index b6c1bd2..1e7a0de 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -63,19 +63,15 @@
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clnttcp_create	__P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     int *,
-				     u_int,
-				     u_int));
+extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
+			      u_int, u_int);
 __END_DECLS
 
 /*
  * Raw (memory) rpc.
  */
 __BEGIN_DECLS
-extern CLIENT *clntraw_create   __P((u_long, u_long));
+extern CLIENT *clntraw_create(u_long, u_long);
 __END_DECLS
 
 
@@ -101,18 +97,10 @@ __END_DECLS
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clntudp_create	__P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     struct timeval,
-				     int *));
-extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     struct timeval,
-				     int *,
-				     u_int,
-				     u_int));
+extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long, 
+			      struct timeval, int *);
+extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
+				 struct timeval, int *, u_int, u_int);
 __END_DECLS
 
 #endif /* _RPC_CLNT_SOC_H */
diff --git a/include/rpc/des.h b/include/rpc/des.h
index 74fa332..f920e22 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -80,4 +80,4 @@ struct desparams {
 /*
  * Software DES.
  */
-extern int _des_crypt __P(( char *, int, struct desparams * ));
+extern int _des_crypt( char *, int, struct desparams * );
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index ce6c1bf..a5df606 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -85,14 +85,14 @@
  * Cipher Block Chaining mode
  */
 __BEGIN_DECLS
-int cbc_crypt __P(( char *, char *, unsigned int, unsigned int, char *));
+int cbc_crypt( char *, char *, unsigned int, unsigned int, char *);
 __END_DECLS
 
 /*
  * Electronic Code Book mode
  */
 __BEGIN_DECLS
-int ecb_crypt __P(( char *, char *, unsigned int, unsigned int ));
+int ecb_crypt( char *, char *, unsigned int, unsigned int );
 __END_DECLS
 
 /* 
@@ -100,7 +100,7 @@ __END_DECLS
  * DES parity is odd and in the low bit of each byte
  */
 __BEGIN_DECLS
-void des_setparity __P(( char *));
+void des_setparity( char *);
 __END_DECLS
 
 #endif  /* _DES_DES_CRYPT_H */
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index f53c445..5e26268 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -55,10 +55,10 @@
 #define	_RPC_UDP	8
 
 __BEGIN_DECLS
-extern void *__rpc_setconf __P((const char *));
-extern void __rpc_endconf __P((void *));
-extern struct netconfig *__rpc_getconf __P((void *));
-extern struct netconfig *__rpc_getconfip __P((const char *));
+extern void *__rpc_setconf(const char *);
+extern void __rpc_endconf(void *);
+extern struct netconfig *__rpc_getconf(void *);
+extern struct netconfig *__rpc_getconfip(const char *);
 __END_DECLS
 
 #endif	/* !_RPC_NETTYPE_H */
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index a2beae5..1902d69 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -67,20 +67,20 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern bool_t		pmap_set	__P((u_long, u_long, int, int));
-extern bool_t		pmap_unset	__P((u_long, u_long));
-extern struct pmaplist	*pmap_getmaps	__P((struct sockaddr_in *));
-extern enum clnt_stat	pmap_rmtcall	__P((struct sockaddr_in *,
-					     u_long, u_long, u_long,
-					     xdrproc_t, caddr_t,
-					     xdrproc_t, caddr_t,
-					     struct timeval, u_long *));
-extern enum clnt_stat	clnt_broadcast	__P((u_long, u_long, u_long,
-					     xdrproc_t, char *,
-					     xdrproc_t, char *,
-					     resultproc_t));
-extern u_short		pmap_getport	__P((struct sockaddr_in *,
-					     u_long, u_long, u_int));
+extern bool_t		pmap_set(u_long, u_long, int, int);
+extern bool_t		pmap_unset(u_long, u_long);
+extern struct pmaplist	*pmap_getmaps(struct sockaddr_in *);
+extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *,
+				     u_long, u_long, u_long,
+				     xdrproc_t, caddr_t,
+				     xdrproc_t, caddr_t,
+				     struct timeval, u_long *);
+extern enum clnt_stat	clnt_broadcast(u_long, u_long, u_long,
+				       xdrproc_t, char *,
+				       xdrproc_t, char *,
+				       resultproc_t);
+extern u_short		pmap_getport(struct sockaddr_in *,
+				     u_long, u_long, u_int);
 __END_DECLS
 
 #endif /* !_RPC_PMAP_CLNT_H_ */
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 7dddab2..366832a 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -99,9 +99,9 @@ struct pmaplist {
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_pmap		__P((XDR *, struct pmap *));
-extern bool_t xdr_pmaplist	__P((XDR *, struct pmaplist **));
-extern bool_t xdr_pmaplist_ptr	__P((XDR *, struct pmaplist *));
+extern bool_t xdr_pmap(XDR *, struct pmap *);
+extern bool_t xdr_pmaplist(XDR *, struct pmaplist **);
+extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *);
 __END_DECLS
 
 #endif /* !_RPC_PMAP_PROT_H */
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 4361f0d..5c08066 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -58,8 +58,8 @@ struct rmtcallres {
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_rmtcall_args	__P((XDR *, struct rmtcallargs *));
-extern bool_t xdr_rmtcallres	__P((XDR *, struct rmtcallres *));
+extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *);
+extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *);
 __END_DECLS
 
 #endif /* !_RPC_PMAP_RMT_H */
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index b770d75..725b542 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -79,19 +79,19 @@
 #include <rpc/rpcent.h>
 
 __BEGIN_DECLS
-extern int get_myaddress __P((struct sockaddr_in *));
-extern int bindresvport __P((int, struct sockaddr_in *));
-extern int registerrpc __P((int, int, int, char *(*) __P((char [UDPMSGSIZE])),
-    xdrproc_t, xdrproc_t));
-extern int callrpc __P((const char *, int, int, int, xdrproc_t, void *,
-    xdrproc_t , void *));
-extern int getrpcport __P((char *, int, int, int));
+extern int get_myaddress(struct sockaddr_in *);
+extern int bindresvport(int, struct sockaddr_in *);
+extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
+    xdrproc_t, xdrproc_t);
+extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
+    xdrproc_t , void *);
+extern int getrpcport(char *, int, int, int);
 
-char *taddr2uaddr __P((const struct netconfig *, const struct netbuf *));
-struct netbuf *uaddr2taddr __P((const struct netconfig *, const char *));
+char *taddr2uaddr(const struct netconfig *, const struct netbuf *);
+struct netbuf *uaddr2taddr(const struct netconfig *, const char *);
 
 struct sockaddr;
-extern int bindresvport_sa __P((int, struct sockaddr *));
+extern int bindresvport_sa(int, struct sockaddr *);
 __END_DECLS
 
 /*
@@ -99,11 +99,10 @@ __END_DECLS
  * and rpcbind use only. Do not use, they may change without notice.
  */
 __BEGIN_DECLS
-int __rpc_nconf2fd __P((const struct netconfig *));
-int __rpc_nconf2sockinfo __P((const struct netconfig *,
-			      struct __rpc_sockinfo *));
-int __rpc_fd2sockinfo __P((int, struct __rpc_sockinfo *));
-u_int __rpc_get_t_size __P((int, int, int));
+int __rpc_nconf2fd(const struct netconfig *);
+int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
+int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
+u_int __rpc_get_t_size(int, int, int);
 __END_DECLS
 
 #endif /* !_RPC_RPC_H */
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index f47db23..80497dd78 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -57,27 +57,26 @@
     (u_int32_t)(now)->tv_usec)
 
 __BEGIN_DECLS
-extern u_int __rpc_get_a_size __P((int));
-extern int __rpc_dtbsize __P((void));
-extern int _rpc_dtablesize __P((void));
-extern struct netconfig * __rpcgettp __P((int));
-extern  int  __rpc_get_default_domain __P((char **));
+extern u_int __rpc_get_a_size(int);
+extern int __rpc_dtbsize(void);
+extern int _rpc_dtablesize(void);
+extern struct netconfig * __rpcgettp(int);
+extern  int  __rpc_get_default_domain(char **);
 
-char *__rpc_taddr2uaddr_af __P((int, const struct netbuf *));
-struct netbuf *__rpc_uaddr2taddr_af __P((int, const char *));
-int __rpc_fixup_addr __P((struct netbuf *, const struct netbuf *));
-int __rpc_sockinfo2netid __P((struct __rpc_sockinfo *, const char **));
-int __rpc_seman2socktype __P((int));
-int __rpc_socktype2seman __P((int));
-void *rpc_nullproc __P((CLIENT *));
-int __rpc_sockisbound __P((int));
+char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
+struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
+int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
+int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
+int __rpc_seman2socktype(int);
+int __rpc_socktype2seman(int);
+void *rpc_nullproc(CLIENT *);
+int __rpc_sockisbound(int);
 
-struct netbuf *__rpcb_findaddr __P((rpcprog_t, rpcvers_t,
-				    const struct netconfig *,
-				    const char *, CLIENT **));
-bool_t __rpc_control __P((int,void *));
+struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
+			       const char *, CLIENT **);
+bool_t __rpc_control(int,void *);
 
-char *_get_next_token __P((char *, int));
+char *_get_next_token(char *, int);
 
 __END_DECLS
 
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index ed634a1..45fd261 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -167,7 +167,7 @@ __BEGIN_DECLS
  * 	XDR *xdrs;
  * 	struct rpc_msg *cmsg;
  */
-extern bool_t	xdr_callmsg	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_callmsg(XDR *, struct rpc_msg *);
 
 /*
  * XDR routine to pre-serialize the static part of a rpc message.
@@ -175,7 +175,7 @@ extern bool_t	xdr_callmsg	__P((XDR *, struct rpc_msg *));
  * 	XDR *xdrs;
  * 	struct rpc_msg *cmsg;
  */
-extern bool_t	xdr_callhdr	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_callhdr(XDR *, struct rpc_msg *);
 
 /*
  * XDR routine to handle a rpc reply.
@@ -183,7 +183,7 @@ extern bool_t	xdr_callhdr	__P((XDR *, struct rpc_msg *));
  * 	XDR *xdrs;
  * 	struct rpc_msg *rmsg;
  */
-extern bool_t	xdr_replymsg	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_replymsg(XDR *, struct rpc_msg *);
 
 
 /*
@@ -192,7 +192,7 @@ extern bool_t	xdr_replymsg	__P((XDR *, struct rpc_msg *));
  * 	XDR *xdrs;
  * 	struct accepted_reply *rej;
  */
-extern bool_t	xdr_accepted_reply	__P((XDR *, struct accepted_reply *));
+extern bool_t	xdr_accepted_reply(XDR *, struct accepted_reply *);
 
 /*
  * XDR routine to handle a rejected rpc reply.
@@ -200,7 +200,7 @@ extern bool_t	xdr_accepted_reply	__P((XDR *, struct accepted_reply *));
  * 	XDR *xdrs;
  * 	struct rejected_reply *rej;
  */
-extern bool_t	xdr_rejected_reply	__P((XDR *, struct rejected_reply *));
+extern bool_t	xdr_rejected_reply(XDR *, struct rejected_reply *);
 
 /*
  * Fills in the error part of a reply message.
@@ -208,7 +208,7 @@ extern bool_t	xdr_rejected_reply	__P((XDR *, struct rejected_reply *));
  * 	struct rpc_msg *msg;
  * 	struct rpc_err *error;
  */
-extern void	_seterr_reply	__P((struct rpc_msg *, struct rpc_err *));
+extern void	_seterr_reply(struct rpc_msg *, struct rpc_err *);
 __END_DECLS
 
 #endif /* !_RPC_RPC_MSG_H */
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index 0f081a4..fa64a85 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -62,24 +62,24 @@
 #include <rpc/rpcb_prot.h>
 
 __BEGIN_DECLS
-extern bool_t rpcb_set __P((const rpcprog_t, const rpcvers_t,
-			    const struct netconfig  *, const struct netbuf *));
-extern bool_t rpcb_unset __P((const rpcprog_t, const rpcvers_t,
-			      const struct netconfig *));
-extern rpcblist	*rpcb_getmaps __P((const struct netconfig *, const char *));
-extern enum clnt_stat rpcb_rmtcall __P((const struct netconfig *,
-					const char *, const rpcprog_t,
-					const rpcvers_t, const rpcproc_t,
-					const xdrproc_t, const caddr_t,
-					const xdrproc_t, const caddr_t,
-					const struct timeval,
-					const struct netbuf *));
-extern bool_t rpcb_getaddr __P((const rpcprog_t, const rpcvers_t,
-				const struct netconfig *, struct netbuf *,
-				const  char *));
-extern bool_t rpcb_gettime __P((const char *, time_t *));
-extern char *rpcb_taddr2uaddr __P((struct netconfig *, struct netbuf *));
-extern struct netbuf *rpcb_uaddr2taddr __P((struct netconfig *, char *));
+extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,
+		       const struct netconfig  *, const struct netbuf *);
+extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,
+			 const struct netconfig *);
+extern rpcblist	*rpcb_getmaps(const struct netconfig *, const char *);
+extern enum clnt_stat rpcb_rmtcall(const struct netconfig *,
+				   const char *, const rpcprog_t,
+				   const rpcvers_t, const rpcproc_t,
+				   const xdrproc_t, const caddr_t,
+				   const xdrproc_t, const caddr_t,
+				   const struct timeval,
+				   const struct netbuf *);
+extern bool_t rpcb_getaddr(const rpcprog_t, const rpcvers_t,
+			   const struct netconfig *, struct netbuf *,
+			   const  char *);
+extern bool_t rpcb_gettime(const char *, time_t *);
+extern char *rpcb_taddr2uaddr(struct netconfig *, struct netbuf *);
+extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *);
 __END_DECLS
 
 #endif	/* !_RPC_RPCB_CLNT_H */
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 234002a..4388d8b 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -53,17 +53,17 @@ struct rpcent {
 };
 
 __BEGIN_DECLS
-extern struct rpcent *getrpcbyname_r __P((const char *, struct rpcent *,
-					  char *, int));
-extern struct rpcent *getrpcbynumber_r __P((int, struct rpcent *, char *, int));
-extern struct rpcent *getrpcent_r __P((struct rpcent *, char *, int));
+extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
+				     char *, int);
+extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
 
 /* Old interfaces that return a pointer to a static area;  MT-unsafe */
-extern struct rpcent *getrpcbyname	__P((char *));
-extern struct rpcent *getrpcbynumber	__P((int));
-extern struct rpcent *getrpcent		__P((void));
-extern void setrpcent __P((int));
-extern void endrpcent __P((void));
+extern struct rpcent *getrpcbyname(char *);
+extern struct rpcent *getrpcbynumber(int);
+extern struct rpcent *getrpcent(void);
+extern void setrpcent(int);
+extern void endrpcent(void);
 __END_DECLS
 
 #endif /* !_RPC_CENT_H */
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 0e50315..5647377 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -86,29 +86,27 @@ typedef struct __rpc_svcxprt {
 	u_short		xp_port;	 /* associated port number */
 	const struct xp_ops {
 	    /* receive incoming requests */
-	    bool_t	(*xp_recv) __P((struct __rpc_svcxprt *,
-				struct rpc_msg *));
+	    bool_t	(*xp_recv)(struct __rpc_svcxprt *, struct rpc_msg *);
 	    /* get transport status */
-	    enum xprt_stat (*xp_stat) __P((struct __rpc_svcxprt *));
+	    enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
 	    /* get arguments */
-	    bool_t	(*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-				caddr_t));
+	    bool_t	(*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
+				caddr_t);
 	    /* send reply */
-	    bool_t	(*xp_reply) __P((struct __rpc_svcxprt *,
-				struct rpc_msg *));
+	    bool_t	(*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
 	    /* free mem allocated for args */
-	    bool_t	(*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-				caddr_t));
+	    bool_t	(*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
+				caddr_t);
 	    /* destroy this struct */
-	    void	(*xp_destroy) __P((struct __rpc_svcxprt *));
+	    void	(*xp_destroy)(struct __rpc_svcxprt *);
 	} *xp_ops;
 	int		xp_addrlen;	 /* length of remote address */
 	struct sockaddr_in xp_raddr;	 /* remote addr. (backward ABI compat) */
 	/* XXX - fvdl stick this here for ABI backward compat reasons */
 	const struct xp_ops2 {
 		/* catch-all function */
-		bool_t  (*xp_control) __P((struct __rpc_svcxprt *, const u_int,
-					   void *));
+		bool_t  (*xp_control)(struct __rpc_svcxprt *, const u_int,
+				void *);
 	} *xp_ops2;
 	char		*xp_tp;		 /* transport provider device name */
 	char		*xp_netid;	 /* network token */
@@ -196,9 +194,9 @@ struct svc_req {
  */
 
 __BEGIN_DECLS
-extern bool_t	svc_reg __P((SVCXPRT *, const rpcprog_t, const rpcvers_t,
-			void (*) __P((struct svc_req *, SVCXPRT *)),
-			const struct netconfig *));
+extern bool_t	svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
+			void (*)(struct svc_req *, SVCXPRT *),
+			const struct netconfig *);
 __END_DECLS
 
 /*
@@ -210,7 +208,7 @@ __END_DECLS
  */
 
 __BEGIN_DECLS
-extern void	svc_unreg __P((const rpcprog_t, const rpcvers_t));
+extern void	svc_unreg(const rpcprog_t, const rpcvers_t);
 __END_DECLS
 
 /*
@@ -220,7 +218,7 @@ __END_DECLS
  *	SVCXPRT *xprt;
  */
 __BEGIN_DECLS
-extern void	xprt_register	__P((SVCXPRT *));
+extern void	xprt_register(SVCXPRT *);
 __END_DECLS
 
 /*
@@ -230,7 +228,7 @@ __END_DECLS
  *	SVCXPRT *xprt;
  */
 __BEGIN_DECLS
-extern void	xprt_unregister	__P((SVCXPRT *));
+extern void	xprt_unregister(SVCXPRT *);
 __END_DECLS
 
 
@@ -261,17 +259,17 @@ __END_DECLS
  */
 
 __BEGIN_DECLS
-extern bool_t	svc_sendreply	__P((SVCXPRT *, xdrproc_t, char *));
-extern void	svcerr_decode	__P((SVCXPRT *));
-extern void	svcerr_weakauth	__P((SVCXPRT *));
-extern void	svcerr_noproc	__P((SVCXPRT *));
-extern void	svcerr_progvers	__P((SVCXPRT *, rpcvers_t, rpcvers_t));
-extern void	svcerr_auth	__P((SVCXPRT *, enum auth_stat));
-extern void	svcerr_noprog	__P((SVCXPRT *));
-extern void	svcerr_systemerr __P((SVCXPRT *));
-extern int	rpc_reg __P((rpcprog_t, rpcvers_t, rpcproc_t,
-			     char *(*) __P((char *)), xdrproc_t, xdrproc_t,
-			     char *));
+extern bool_t	svc_sendreply(SVCXPRT *, xdrproc_t, char *);
+extern void	svcerr_decode(SVCXPRT *);
+extern void	svcerr_weakauth(SVCXPRT *);
+extern void	svcerr_noproc(SVCXPRT *);
+extern void	svcerr_progvers(SVCXPRT *, rpcvers_t, rpcvers_t);
+extern void	svcerr_auth(SVCXPRT *, enum auth_stat);
+extern void	svcerr_noprog(SVCXPRT *);
+extern void	svcerr_systemerr(SVCXPRT *);
+extern int	rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
+			char *(*)(char *), xdrproc_t, xdrproc_t,
+			char *);
 __END_DECLS
 
 /*
@@ -302,18 +300,18 @@ extern int svc_fds;
  * also see clnt.h for protocol numbers.
  */
 __BEGIN_DECLS
-extern void rpctest_service __P((void));
+extern void rpctest_service(void);
 __END_DECLS
 
 __BEGIN_DECLS
-extern void	svc_getreq	__P((int));
-extern void	svc_getreqset	__P((fd_set *));
-extern void	svc_getreq_common	__P((int));
+extern void	svc_getreq(int);
+extern void	svc_getreqset(fd_set *);
+extern void	svc_getreq_common(int);
 struct pollfd;
-extern void	svc_getreq_poll __P((struct pollfd *, int));
+extern void	svc_getreq_poll(struct pollfd *, int);
 
-extern void	svc_run		__P((void));
-extern void	svc_exit	__P((void));
+extern void	svc_run(void);
+extern void	svc_exit(void);
 __END_DECLS
 
 /*
@@ -330,8 +328,8 @@ __BEGIN_DECLS
 /*
  * Transport independent svc_create routine.
  */
-extern int svc_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
-			   const rpcprog_t, const rpcvers_t, const char *));
+extern int svc_create(void (*)(struct svc_req *, SVCXPRT *),
+			   const rpcprog_t, const rpcvers_t, const char *);
 /*
  *      void (*dispatch)();             -- dispatch routine
  *      const rpcprog_t prognum;        -- program number
@@ -345,9 +343,9 @@ extern int svc_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
  * instead of a nettype.
  */
 
-extern SVCXPRT *svc_tp_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
+extern SVCXPRT *svc_tp_create(void (*)(struct svc_req *, SVCXPRT *),
 				   const rpcprog_t, const rpcvers_t,
-				   const struct netconfig *));
+				   const struct netconfig *);
         /*
          * void (*dispatch)();            -- dispatch routine
          * const rpcprog_t prognum;       -- program number
@@ -359,9 +357,9 @@ extern SVCXPRT *svc_tp_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
 /*
  * Generic TLI create routine
  */
-extern SVCXPRT *svc_tli_create __P((const int, const struct netconfig *,
-				    const struct t_bind *, const u_int,
-				    const u_int));
+extern SVCXPRT *svc_tli_create(const int, const struct netconfig *,
+			       const struct t_bind *, const u_int,
+			       const u_int);
 /*
  *      const int fd;                   -- connection end point
  *      const struct netconfig *nconf;  -- netconfig structure for network
@@ -374,7 +372,7 @@ extern SVCXPRT *svc_tli_create __P((const int, const struct netconfig *,
  * Connectionless and connectionful create routines
  */
 
-extern SVCXPRT *svc_vc_create __P((const int, const u_int, const u_int));
+extern SVCXPRT *svc_vc_create(const int, const u_int, const u_int);
 /*
  *      const int fd;                           -- open connection end point
  *      const u_int sendsize;                   -- max send size
@@ -384,9 +382,9 @@ extern SVCXPRT *svc_vc_create __P((const int, const u_int, const u_int));
 /*
  * Added for compatibility to old rpc 4.0. Obsoleted by svc_vc_create().
  */
-extern SVCXPRT *svcunix_create __P((int, u_int, u_int, char *));
+extern SVCXPRT *svcunix_create(int, u_int, u_int, char *);
 
-extern SVCXPRT *svc_dg_create __P((const int, const u_int, const u_int));
+extern SVCXPRT *svc_dg_create(const int, const u_int, const u_int);
         /*
          * const int fd;                                -- open connection
          * const u_int sendsize;                        -- max send size
@@ -398,7 +396,7 @@ extern SVCXPRT *svc_dg_create __P((const int, const u_int, const u_int));
  * the routine takes any *open* connection
  * descriptor as its first input and is used for open connections.
  */
-extern SVCXPRT *svc_fd_create __P((const int, const u_int, const u_int));
+extern SVCXPRT *svc_fd_create(const int, const u_int, const u_int);
 /*
  *      const int fd;                           -- open connection end point
  *      const u_int sendsize;                   -- max send size
@@ -408,17 +406,17 @@ extern SVCXPRT *svc_fd_create __P((const int, const u_int, const u_int));
 /*
  * Added for compatibility to old rpc 4.0. Obsoleted by svc_fd_create().
  */
-extern SVCXPRT *svcunixfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svcunixfd_create(int, u_int, u_int);
 
 /*
  * Memory based rpc (for speed check and testing)
  */
-extern SVCXPRT *svc_raw_create __P((void));
+extern SVCXPRT *svc_raw_create(void);
 
 /*
  * svc_dg_enable_cache() enables the cache on dg transports.
  */
-int svc_dg_enablecache __P((SVCXPRT *, const u_int));
+int svc_dg_enablecache(SVCXPRT *, const u_int);
 
 int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid);
 
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 8f55339..67df976 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -46,9 +46,9 @@
  * Server side authenticator
  */
 __BEGIN_DECLS
-extern enum auth_stat _authenticate __P((struct svc_req *, struct rpc_msg *));
-extern int svc_auth_reg __P((int, enum auth_stat (*) __P((struct svc_req *,
-							  struct rpc_msg *))));
+extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *);
+extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *,
+			  struct rpc_msg *));
 
 __END_DECLS
 
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index c3d16fe..6c528db 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -65,8 +65,8 @@
  *	int protocol;    like TCP or UDP, zero means do not register 
  */
 __BEGIN_DECLS
-extern bool_t	svc_register __P((SVCXPRT *, u_long, u_long,
-		    void (*) __P((struct svc_req *, SVCXPRT *)), int));
+extern bool_t	svc_register(SVCXPRT *, u_long, u_long,
+		    void (*)(struct svc_req *, SVCXPRT *), int);
 __END_DECLS
 
 /*
@@ -77,7 +77,7 @@ __END_DECLS
  *	u_long vers;
  */
 __BEGIN_DECLS
-extern void	svc_unregister __P((u_long, u_long));
+extern void	svc_unregister(u_long, u_long);
 __END_DECLS
 
 
@@ -85,7 +85,7 @@ __END_DECLS
  * Memory based rpc for testing and timing.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcraw_create __P((void));
+extern SVCXPRT *svcraw_create(void);
 __END_DECLS
 
 
@@ -93,9 +93,9 @@ __END_DECLS
  * Udp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcudp_create __P((int));
-extern SVCXPRT *svcudp_bufcreate __P((int, u_int, u_int));
-extern int svcudp_enablecache __P((SVCXPRT *, u_long));
+extern SVCXPRT *svcudp_create(int);
+extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
+extern int svcudp_enablecache(SVCXPRT *, u_long);
 __END_DECLS
 
 
@@ -103,14 +103,14 @@ __END_DECLS
  * Tcp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svctcp_create __P((int, u_int, u_int));
+extern SVCXPRT *svctcp_create(int, u_int, u_int);
 __END_DECLS
 
 /*
  * Fd based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svcfd_create(int, u_int, u_int);
 __END_DECLS
 
 #endif /* !_RPC_SVC_SOC_H */
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 9867b25..0162c97 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -101,22 +101,22 @@ typedef struct __rpc_xdr {
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	const struct xdr_ops {
 		/* get a long from underlying stream */
-		bool_t	(*x_getlong) __P((struct __rpc_xdr *, long *));
+		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
 		/* put a long to " */
-		bool_t	(*x_putlong) __P((struct __rpc_xdr *, const long *));
+		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
 		/* get some bytes from " */
-		bool_t	(*x_getbytes) __P((struct __rpc_xdr *, char *, u_int));
+		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, u_int);
 		/* put some bytes to " */
-		bool_t	(*x_putbytes) __P((struct __rpc_xdr *, const char *, u_int));
+		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
 		/* returns bytes off from beginning */
-		u_int	(*x_getpostn) __P((struct __rpc_xdr *));
+		u_int	(*x_getpostn)(struct __rpc_xdr *);
 		/* lets you reposition the stream */
-		bool_t  (*x_setpostn) __P((struct __rpc_xdr *, u_int));
+		bool_t  (*x_setpostn)(struct __rpc_xdr *, u_int);
 		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline) __P((struct __rpc_xdr *, u_int));
+		int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
 		/* free privates of this xdr_stream */
-		void	(*x_destroy) __P((struct __rpc_xdr *));
-		bool_t	(*x_control) __P((struct __rpc_xdr *, int, void *));
+		void	(*x_destroy)(struct __rpc_xdr *);
+		bool_t	(*x_control)(struct __rpc_xdr *, int, void *);
 	} *x_ops;
 	char *	 	x_public;	/* users' data */
 	void *		x_private;	/* pointer to private data */
@@ -133,12 +133,12 @@ typedef struct __rpc_xdr {
  * allocate dynamic storage of the appropriate size and return it.
  */
 #ifdef _KERNEL
-typedef	bool_t (*xdrproc_t) __P((XDR *, void *, u_int));
+typedef	bool_t (*xdrproc_t)(XDR *, void *, u_int);
 #else
 /*
  * XXX can't actually prototype it, because some take three args!!!
  */
-typedef	bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */));
+typedef	bool_t (*xdrproc_t)(/* XDR *, void *, u_int */);
 #endif
 
 /*
@@ -285,40 +285,40 @@ struct xdr_discrim {
  * These are the "generic" xdr routines.
  */
 __BEGIN_DECLS
-extern bool_t	xdr_void	__P((void));
-extern bool_t	xdr_int		__P((XDR *, int *));
-extern bool_t	xdr_u_int	__P((XDR *, u_int *));
-extern bool_t	xdr_long	__P((XDR *, long *));
-extern bool_t	xdr_u_long	__P((XDR *, u_long *));
-extern bool_t	xdr_short	__P((XDR *, short *));
-extern bool_t	xdr_u_short	__P((XDR *, u_short *));
-extern bool_t	xdr_int16_t	__P((XDR *, int16_t *));
-extern bool_t	xdr_u_int16_t	__P((XDR *, u_int16_t *));
-extern bool_t	xdr_int32_t	__P((XDR *, int32_t *));
-extern bool_t	xdr_u_int32_t	__P((XDR *, u_int32_t *));
-extern bool_t	xdr_int64_t	__P((XDR *, int64_t *));
-extern bool_t	xdr_u_int64_t	__P((XDR *, u_int64_t *));
-extern bool_t	xdr_bool	__P((XDR *, bool_t *));
-extern bool_t	xdr_enum	__P((XDR *, enum_t *));
-extern bool_t	xdr_array	__P((XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t	xdr_bytes	__P((XDR *, char **, u_int *, u_int));
-extern bool_t	xdr_opaque	__P((XDR *, char *, u_int));
-extern bool_t	xdr_string	__P((XDR *, char **, u_int));
-extern bool_t	xdr_union	__P((XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t));
-extern bool_t	xdr_char	__P((XDR *, char *));
-extern bool_t	xdr_u_char	__P((XDR *, u_char *));
-extern bool_t	xdr_vector	__P((XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t	xdr_float	__P((XDR *, float *));
-extern bool_t	xdr_double	__P((XDR *, double *));
-extern bool_t	xdr_quadruple	__P((XDR *, long double *));
-extern bool_t	xdr_reference	__P((XDR *, char **, u_int, xdrproc_t));
-extern bool_t	xdr_pointer	__P((XDR *, char **, u_int, xdrproc_t));
-extern bool_t	xdr_wrapstring	__P((XDR *, char **));
-extern void	xdr_free 	__P((xdrproc_t, char *));
-extern bool_t	xdr_hyper	__P((XDR *, quad_t *));
-extern bool_t	xdr_u_hyper	__P((XDR *, u_quad_t *));
-extern bool_t	xdr_longlong_t	__P((XDR *, quad_t *));
-extern bool_t	xdr_u_longlong_t __P((XDR *, u_quad_t *));
+extern bool_t	xdr_void(void);
+extern bool_t	xdr_int(XDR *, int *);
+extern bool_t	xdr_u_int(XDR *, u_int *);
+extern bool_t	xdr_long(XDR *, long *);
+extern bool_t	xdr_u_long(XDR *, u_long *);
+extern bool_t	xdr_short(XDR *, short *);
+extern bool_t	xdr_u_short(XDR *, u_short *);
+extern bool_t	xdr_int16_t(XDR *, int16_t *);
+extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t	xdr_int32_t(XDR *, int32_t *);
+extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t	xdr_int64_t(XDR *, int64_t *);
+extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
+extern bool_t	xdr_bool(XDR *, bool_t *);
+extern bool_t	xdr_enum(XDR *, enum_t *);
+extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t	xdr_bytes(XDR *, char **, u_int *, u_int);
+extern bool_t	xdr_opaque(XDR *, char *, u_int);
+extern bool_t	xdr_string(XDR *, char **, u_int);
+extern bool_t	xdr_union(XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t);
+extern bool_t	xdr_char(XDR *, char *);
+extern bool_t	xdr_u_char(XDR *, u_char *);
+extern bool_t	xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t	xdr_float(XDR *, float *);
+extern bool_t	xdr_double(XDR *, double *);
+extern bool_t	xdr_quadruple(XDR *, long double *);
+extern bool_t	xdr_reference(XDR *, char **, u_int, xdrproc_t);
+extern bool_t	xdr_pointer(XDR *, char **, u_int, xdrproc_t);
+extern bool_t	xdr_wrapstring(XDR *, char **);
+extern void	xdr_free(xdrproc_t, char *);
+extern bool_t	xdr_hyper(XDR *, quad_t *);
+extern bool_t	xdr_u_hyper(XDR *, u_quad_t *);
+extern bool_t	xdr_longlong_t(XDR *, quad_t *);
+extern bool_t	xdr_u_longlong_t(XDR *, u_quad_t *);
 __END_DECLS
 
 /*
@@ -331,7 +331,7 @@ struct netobj {
 	char	*n_bytes;
 };
 typedef struct netobj netobj;
-extern bool_t   xdr_netobj __P((XDR *, struct netobj *));
+extern bool_t   xdr_netobj(XDR *, struct netobj *);
 
 /*
  * These are the public routines for the various implementations of
@@ -339,27 +339,27 @@ extern bool_t   xdr_netobj __P((XDR *, struct netobj *));
  */
 __BEGIN_DECLS
 /* XDR using memory buffers */
-extern void   xdrmem_create	__P((XDR *, char *, u_int, enum xdr_op));
+extern void   xdrmem_create(XDR *, char *, u_int, enum xdr_op);
 
 /* XDR using stdio library */
 #ifdef _STDIO_H_
-extern void   xdrstdio_create	__P((XDR *, FILE *, enum xdr_op));
+extern void   xdrstdio_create(XDR *, FILE *, enum xdr_op);
 #endif
 
 /* XDR pseudo records for tcp */
-extern void   xdrrec_create	__P((XDR *, u_int, u_int, char *,
-				    int (*) __P((char *, char *, int)),
-				    int (*) __P((char *, char *, int))));
+extern void   xdrrec_create(XDR *, u_int, u_int, char *,
+			    int (*)(char *, char *, int),
+			    int (*)(char *, char *, int));
 
 /* make end of xdr record */
-extern bool_t xdrrec_endofrecord __P((XDR *, int));
+extern bool_t xdrrec_endofrecord(XDR *, int);
 
 /* move to beginning of next record */
-extern bool_t xdrrec_skiprecord	__P((XDR *));
+extern bool_t xdrrec_skiprecord(XDR *);
 
 /* true if no more input */
-extern bool_t xdrrec_eof	__P((XDR *));
-extern u_int xdrrec_readbytes	__P((XDR *, caddr_t, u_int));
+extern bool_t xdrrec_eof(XDR *);
+extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
 __END_DECLS
 
 #endif /* !_RPC_XDR_H */