Make some of the rpc stuff compile

 -Erik

4 files changed, 16 insertions, 14 deletions

diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index b3852927a..f98d4ccf0 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) __PMT ((CLIENT *, u_long, xdrproc_t,
+    enum clnt_stat (*cl_call) __P ((CLIENT *, u_long, xdrproc_t,
 				      caddr_t, xdrproc_t,
 				      caddr_t, struct timeval));
 			       	/* call remote procedure */
-    void (*cl_abort) __PMT ((void));  /* abort a call */
-    void (*cl_geterr) __PMT ((CLIENT *, struct rpc_err *));
+    void (*cl_abort) __P ((void));  /* abort a call */
+    void (*cl_geterr) __P ((CLIENT *, struct rpc_err *));
 				/* get specific error code */
-    bool_t (*cl_freeres) __PMT ((CLIENT *, xdrproc_t, caddr_t));
+    bool_t (*cl_freeres) __P ((CLIENT *, xdrproc_t, caddr_t));
 				/* frees results */
-    void (*cl_destroy) __PMT ((CLIENT *)); /* destroy this structure */
-    bool_t (*cl_control) __PMT ((CLIENT *, int, char *));
+    void (*cl_destroy) __P ((CLIENT *)); /* destroy this structure */
+    bool_t (*cl_control) __P ((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 d9800d400..a36f7b72f 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -45,7 +45,7 @@
 
 __BEGIN_DECLS
 
-typedef bool_t (*resultproc_t) __PMT ((caddr_t resp,
+typedef bool_t (*resultproc_t) __P ((caddr_t resp,
 				       struct sockaddr_in *raddr));
 
 /*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index a966d2e23..725103507 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -65,6 +65,8 @@
  * 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
 
 #endif /* rpc/rpc.h */
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 4ac2a5cdf..1039bcc15 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) __PMT ((SVCXPRT *__xprt, struct rpc_msg *__msg));
+    bool_t	(*xp_recv) __P ((SVCXPRT *__xprt, struct rpc_msg *__msg));
 				/* receive incoming requests */
-    enum xprt_stat (*xp_stat) __PMT ((SVCXPRT *__xprt));
+    enum xprt_stat (*xp_stat) __P ((SVCXPRT *__xprt));
 				/* get transport status */
-    bool_t	(*xp_getargs) __PMT ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
+    bool_t	(*xp_getargs) __P ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
 				      caddr_t args_ptr)); /* get arguments */
-    bool_t	(*xp_reply) __PMT ((SVCXPRT *__xprt, struct rpc_msg *__msg));
+    bool_t	(*xp_reply) __P ((SVCXPRT *__xprt, struct rpc_msg *__msg));
 				/* send reply */
-    bool_t	(*xp_freeargs) __PMT ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
+    bool_t	(*xp_freeargs) __P ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
 				       caddr_t args_ptr));
 				/* free mem allocated for args */
-    void	(*xp_destroy) __PMT ((SVCXPRT *__xprt));
+    void	(*xp_destroy) __P ((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) __PMT ((struct svc_req*, SVCXPRT*));
+typedef void (*__dispatch_fn_t) __P ((struct svc_req*, SVCXPRT*));
 #endif
 
 /*