Makeheader files be more like GNU

6 files changed, 31 insertions, 33 deletions

diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 35f30e4a3..e0e1e5f67 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -97,12 +97,12 @@ struct AUTH {
   struct opaque_auth ah_verf;
   union des_block ah_key;
   struct auth_ops {
-    void (*ah_nextverf) __P ((AUTH *));
-    int  (*ah_marshal) __P ((AUTH *, XDR *));	/* nextverf & serialize */
-    int  (*ah_validate) __P ((AUTH *, struct opaque_auth *));
+    void (*ah_nextverf) __PMT ((AUTH *));
+    int  (*ah_marshal) __PMT ((AUTH *, XDR *));	/* nextverf & serialize */
+    int  (*ah_validate) __PMT ((AUTH *, struct opaque_auth *));
 						/* validate verifier */
-    int  (*ah_refresh) __P ((AUTH *));	/* refresh credentials */
-    void (*ah_destroy) __P ((AUTH *));     	/* destroy this structure */
+    int  (*ah_refresh) __PMT ((AUTH *));	/* refresh credentials */
+    void (*ah_destroy) __PMT ((AUTH *));     	/* destroy this structure */
   } *ah_ops;
   caddr_t ah_private;
 };
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index f98d4ccf0..b3852927a 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -133,17 +133,17 @@ typedef struct CLIENT CLIENT;
 struct CLIENT {
   AUTH	*cl_auth;		 /* authenticator */
   struct clnt_ops {
-    enum clnt_stat (*cl_call) __P ((CLIENT *, u_long, xdrproc_t,
+    enum clnt_stat (*cl_call) __PMT ((CLIENT *, u_long, xdrproc_t,
 				      caddr_t, xdrproc_t,
 				      caddr_t, struct timeval));
 			       	/* call remote procedure */
-    void (*cl_abort) __P ((void));  /* abort a call */
-    void (*cl_geterr) __P ((CLIENT *, struct rpc_err *));
+    void (*cl_abort) __PMT ((void));  /* abort a call */
+    void (*cl_geterr) __PMT ((CLIENT *, struct rpc_err *));
 				/* get specific error code */
-    bool_t (*cl_freeres) __P ((CLIENT *, xdrproc_t, caddr_t));
+    bool_t (*cl_freeres) __PMT ((CLIENT *, xdrproc_t, caddr_t));
 				/* frees results */
-    void (*cl_destroy) __P ((CLIENT *)); /* destroy this structure */
-    bool_t (*cl_control) __P ((CLIENT *, int, char *));
+    void (*cl_destroy) __PMT ((CLIENT *)); /* destroy this structure */
+    bool_t (*cl_control) __PMT ((CLIENT *, int, char *));
 				/* the ioctl() of rpc */
   } *cl_ops;
   caddr_t cl_private;		/* private stuff */
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index a36f7b72f..d9800d400 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -45,7 +45,7 @@
 
 __BEGIN_DECLS
 
-typedef bool_t (*resultproc_t) __P ((caddr_t resp,
+typedef bool_t (*resultproc_t) __PMT ((caddr_t resp,
 				       struct sockaddr_in *raddr));
 
 /*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 725103507..74e529d82 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -65,8 +65,6 @@
  * defined by <rpc/netdb.h> included in <netdb.h>.
  */
 /* routines for parsing /etc/rpc */
-#if 0
-#include <rpc/netdb.h>		/* structures and routines to parse /etc/rpc */
-#endif
+//#include <rpc/netdb.h>		/* structures and routines to parse /etc/rpc */
 
 #endif /* rpc/rpc.h */
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 1039bcc15..4ac2a5cdf 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -78,18 +78,18 @@ struct SVCXPRT {
   int xp_sock;
   u_short xp_port;		/* associated port number */
   const struct xp_ops {
-    bool_t	(*xp_recv) __P ((SVCXPRT *__xprt, struct rpc_msg *__msg));
+    bool_t	(*xp_recv) __PMT ((SVCXPRT *__xprt, struct rpc_msg *__msg));
 				/* receive incoming requests */
-    enum xprt_stat (*xp_stat) __P ((SVCXPRT *__xprt));
+    enum xprt_stat (*xp_stat) __PMT ((SVCXPRT *__xprt));
 				/* get transport status */
-    bool_t	(*xp_getargs) __P ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
+    bool_t	(*xp_getargs) __PMT ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
 				      caddr_t args_ptr)); /* get arguments */
-    bool_t	(*xp_reply) __P ((SVCXPRT *__xprt, struct rpc_msg *__msg));
+    bool_t	(*xp_reply) __PMT ((SVCXPRT *__xprt, struct rpc_msg *__msg));
 				/* send reply */
-    bool_t	(*xp_freeargs) __P ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
+    bool_t	(*xp_freeargs) __PMT ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
 				       caddr_t args_ptr));
 				/* free mem allocated for args */
-    void	(*xp_destroy) __P ((SVCXPRT *__xprt));
+    void	(*xp_destroy) __PMT ((SVCXPRT *__xprt));
 				/* destroy this struct */
   } *xp_ops;
   int		xp_addrlen;	 /* length of remote address */
@@ -157,7 +157,7 @@ struct svc_req {
 
 #ifndef __DISPATCH_FN_T
 #define __DISPATCH_FN_T
-typedef void (*__dispatch_fn_t) __P ((struct svc_req*, SVCXPRT*));
+typedef void (*__dispatch_fn_t) __PMT ((struct svc_req*, SVCXPRT*));
 #endif
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index c2505ca95..91dbcc3da 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -114,27 +114,27 @@ struct XDR
     enum xdr_op x_op;		/* operation; fast additional param */
     struct xdr_ops
       {
-	bool_t (*x_getlong) __P ((XDR *__xdrs, long *__lp));
+	bool_t (*x_getlong) __PMT ((XDR *__xdrs, long *__lp));
 	/* get a long from underlying stream */
-	bool_t (*x_putlong) __P ((XDR *__xdrs, __const long *__lp));
+	bool_t (*x_putlong) __PMT ((XDR *__xdrs, __const long *__lp));
 	/* put a long to " */
-	bool_t (*x_getbytes) __P ((XDR *__xdrs, caddr_t __addr,
+	bool_t (*x_getbytes) __PMT ((XDR *__xdrs, caddr_t __addr,
 				     u_int __len));
 	/* get some bytes from " */
-	bool_t (*x_putbytes) __P ((XDR *__xdrs, __const char *__addr,
+	bool_t (*x_putbytes) __PMT ((XDR *__xdrs, __const char *__addr,
 				     u_int __len));
 	/* put some bytes to " */
-	u_int (*x_getpostn) __P ((__const XDR *__xdrs));
+	u_int (*x_getpostn) __PMT ((__const XDR *__xdrs));
 	/* returns bytes off from beginning */
-	bool_t (*x_setpostn) __P ((XDR *__xdrs, u_int pos));
+	bool_t (*x_setpostn) __PMT ((XDR *__xdrs, u_int pos));
 	/* lets you reposition the stream */
-	int32_t *(*x_inline) __P ((XDR *__xdrs, int len));
+	int32_t *(*x_inline) __PMT ((XDR *__xdrs, int len));
 	/* buf quick ptr to buffered data */
-	void (*x_destroy) __P ((XDR *__xdrs));
+	void (*x_destroy) __PMT ((XDR *__xdrs));
 	/* free privates of this xdr_stream */
-	bool_t (*x_getint32) __P ((XDR *__xdrs, int32_t *__ip));
+	bool_t (*x_getint32) __PMT ((XDR *__xdrs, int32_t *__ip));
 	/* get a int from underlying stream */
-	bool_t (*x_putint32) __P ((XDR *__xdrs, __const int32_t *__ip));
+	bool_t (*x_putint32) __PMT ((XDR *__xdrs, __const int32_t *__ip));
 	/* put a int to " */
       }
      *x_ops;
@@ -153,7 +153,7 @@ struct XDR
  * allocate dynamic storage of the appropriate size and return it.
  * bool_t       (*xdrproc_t)(XDR *, caddr_t *);
  */
-typedef bool_t (*xdrproc_t) __P ((XDR *, void *,...));
+typedef bool_t (*xdrproc_t) __PMT ((XDR *, void *,...));
 
 
 /*