 @@ -1,14 +1,14 @@
-/*	$NetBSD: auth.h,v 1.18 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: auth.h,v 1.19 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -77,27 +77,27 @@ union des_block {
 	char c[8];
 };
 typedef union des_block des_block;
 __BEGIN_DECLS
 extern bool_t xdr_des_block(XDR *, des_block *);
 __END_DECLS
 /*
  * Authentication info.  Opaque to client.
  */
 struct opaque_auth {
 	enum_t	oa_flavor;		/* flavor of auth */
 	caddr_t	oa_base;		/* address of more auth stuff */
-	unsigned oa_length;		/* not to exceed MAX_AUTH_BYTES */
+	unsigned int oa_length;		/* not to exceed MAX_AUTH_BYTES */
 };
 /*
  * Auth handle, interface to client side authenticators.
  */
 typedef struct __rpc_auth {
 	struct	opaque_auth	ah_cred;
 	struct	opaque_auth	ah_verf;
 	union	des_block	ah_key;
 	const struct auth_ops {
 		void	(*ah_nextverf)(struct __rpc_auth *);
 		/* nextverf & serialize */
 @@ -159,27 +159,27 @@ extern struct opaque_auth _null_auth;
  * Unix style authentication
  * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
  *	char *machname;
  *	int uid;
  *	int gid;
  *	int len;
  *	int *aup_gids;
  */
 __BEGIN_DECLS
 struct sockaddr_in;
 extern AUTH *authunix_create		(char *, int, int, int, int *);
 extern AUTH *authunix_create_default	(void);
 extern AUTH *authnone_create		(void);
-extern AUTH *authdes_create		(char *, unsigned,
+extern AUTH *authdes_create		(char *, unsigned int,
 					    struct sockaddr_in *, des_block *);
 extern bool_t xdr_opaque_auth		(XDR *, struct opaque_auth *);
 #define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
 #define authsys_create_default() authunix_create_default()
 struct svc_req;
 struct rpc_msg;
 enum auth_stat _svcauth_null(struct svc_req *, struct rpc_msg *);
 enum auth_stat _svcauth_short(struct svc_req *, struct rpc_msg *);
 enum auth_stat _svcauth_unix(struct svc_req *, struct rpc_msg *);
 __END_DECLS

 @@ -1,14 +1,14 @@
-/*	$NetBSD: auth_unix.h,v 1.9 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: auth_unix.h,v 1.10 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -53,27 +53,27 @@
 #define MAX_MACHINE_NAME 255
 /* gids compose part of a credential; there may not be more than 16 of them */
 #define NGRPS 16
 /*
  * Unix style credentials.
  */
 struct authunix_parms {
 	unsigned long aup_time;
 	char	*aup_machname;
 	int	 aup_uid;
 	int	 aup_gid;
-	unsigned aup_len;
+	unsigned int aup_len;
 	int	*aup_gids;
 };
 __BEGIN_DECLS
 extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
 __END_DECLS
 /*
  * If a response verifier has flavor AUTH_SHORT,
  * then the body of the response verifier encapsulates the following structure;
  * again it is serialized in the obvious fashion.
  */
 struct short_hand_verf {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: clnt.h,v 1.23 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: clnt.h,v 1.24 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -146,28 +146,28 @@ typedef struct __rpc_client {
 				    rpcproc_t, xdrproc_t, const char *,
 				    xdrproc_t, caddr_t, struct timeval);
 		/* abort a call */
 		void		(*cl_abort)(struct __rpc_client *);
 		/* get specific error code */
 		void		(*cl_geterr)(struct __rpc_client *,
 				    struct rpc_err *);
 		/* frees results */
 		bool_t		(*cl_freeres)(struct __rpc_client *,
 				    xdrproc_t, caddr_t);
 		/* destroy this structure */
 		void		(*cl_destroy)(struct __rpc_client *);
 		/* the ioctl() of rpc */
-		bool_t          (*cl_control)(struct __rpc_client *, unsigned,
+		bool_t          (*cl_control)(struct __rpc_client *,
-				    char *);
+				    unsigned int, char *);
 	} *cl_ops;
 	void 			*cl_private;	/* private stuff */
 	char			*cl_netid;	/* network token */
 	char			*cl_tp;		/* device name */
 } CLIENT;
 /*
  * Timers used for the pseudo-transport protocol when using datagrams
  */
 struct rpc_timers {
 	unsigned short	rt_srtt;	/* smoothed round-trip time */
 	unsigned short	rt_deviate;	/* estimated deviation */
 @@ -355,59 +355,59 @@ extern CLIENT *clnt_tp_create(const char
 /*
  *	const char *hostname;			-- hostname
  *	const rpcprog_t prog;			-- program number
  *	const rpcvers_t vers;			-- version number
  *	const struct netconfig *netconf; 	-- network config structure
  */
 /*
  * Generic TLI create routine. Only provided for compatibility.
  */
 extern CLIENT *clnt_tli_create(const int, const struct netconfig *,
 				    const struct netbuf *, const rpcprog_t,
-				    const rpcvers_t, const unsigned,
+				    const rpcvers_t, const unsigned int,
-				    const unsigned);
+				    const unsigned int);
 /*
  *	const register int fd;		-- fd
  *	const struct netconfig *nconf;	-- netconfig structure
  *	const struct netbuf *svcaddr;		-- servers address
  *	const unsigned long prog;		-- program number
  *	const unsigned long vers;		-- version number
  *	const unsigned sendsz;			-- send size
  *	const unsigned recvsz;			-- recv size
  */
 /*
  * Low level clnt create routine for connectionful transports, e.g. tcp.
  */
 extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
 				   const rpcprog_t, const rpcvers_t,
-				   const unsigned, const unsigned);
+				   const unsigned int, const unsigned int);
 /*
  *	const int fd;				-- open file descriptor
  *	const struct netbuf *svcaddr;		-- servers address
  *	const rpcprog_t prog;			-- program number
  *	const rpcvers_t vers;			-- version number
  *	const unsigned sendsz;			-- buffer recv size
  *	const unsigned recvsz;			-- buffer send size
  */
 /*
  * Low level clnt create routine for connectionless transports, e.g. udp.
  */
 extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
 				   const rpcprog_t, const rpcvers_t,
-				   const unsigned, const unsigned);
+				   const unsigned int, const unsigned int);
 /*
  *	const int fd;				-- open file descriptor
  *	const struct netbuf *svcaddr;		-- servers address
  *	const rpcprog_t program;		-- program number
  *	const rpcvers_t version;		-- version number
  *	const unsigned sendsz;			-- buffer recv size
  *	const unsigned recvsz;			-- buffer send size
  */
 /*
  * Memory based rpc (for speed check and testing)
  * CLIENT *
  * clnt_raw_create(prog, vers)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: clnt_soc.h,v 1.4 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: clnt_soc.h,v 1.5 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -56,28 +56,28 @@
  * clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
  *	struct sockaddr_in *raddr;
  *	unsigned long prog;
  *	unsigned long version;
  *	int *sockp;
  *	unsigned sendsz;
  *	unsigned recvsz;
  */
 __BEGIN_DECLS
 extern CLIENT *clnttcp_create(struct sockaddr_in *,
 				unsigned long,
 				unsigned long,
 				int *,
-				unsigned,
+				unsigned int,
-				unsigned);
+				unsigned int);
 __END_DECLS
 /*
  * Raw (memory) rpc.
  */
 __BEGIN_DECLS
 extern CLIENT *clntraw_create  (unsigned long, unsigned long);
 __END_DECLS
 /*
  * UDP based rpc.
  * CLIENT *
 @@ -100,18 +100,18 @@ __END_DECLS
  *	unsigned recvsz;
  */
 __BEGIN_DECLS
 extern CLIENT *clntudp_create(struct sockaddr_in *,
 				unsigned long,
 				unsigned long,
 				struct timeval,
 				int *);
 extern CLIENT *clntudp_bufcreate(struct sockaddr_in *,
 				     unsigned long,
 				     unsigned long,
 				     struct timeval,
 				     int *,
-				     unsigned,
+				     unsigned int,
-				     unsigned);
+				     unsigned int);
 __END_DECLS
 #endif /* _RPC_CLNT_SOC_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_clnt.h,v 1.12 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: pmap_clnt.h,v 1.13 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -73,19 +73,19 @@ extern struct pmaplist	*pmap_getmaps(str
 extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *,
 					unsigned long, unsigned long,
 					unsigned long,
 					xdrproc_t, caddr_t,
 					xdrproc_t, caddr_t,
 					struct timeval, unsigned long *)
 					__RENAME(__pmap_rmtcall50);
 #endif
 extern enum clnt_stat	clnt_broadcast(unsigned long, unsigned long,
 					unsigned long,
 					xdrproc_t, char *,
 					xdrproc_t, char *,
 					resultproc_t);
-extern u_short		pmap_getport(struct sockaddr_in *,
+extern unsigned short	pmap_getport(struct sockaddr_in *,
 					unsigned long, unsigned long,
-					unsigned);
+					unsigned int);
 __END_DECLS
 #endif /* !_RPC_PMAP_CLNT_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svc.h,v 1.30 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: svc.h,v 1.31 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -98,28 +98,28 @@ typedef struct __rpc_svcxprt {
 		/* send reply */
 		bool_t	(*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
 		/* free mem allocated for args */
 		bool_t	(*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
 			    caddr_t);
 		/* destroy this struct */
 		void	(*xp_destroy)(struct __rpc_svcxprt *);
 	} *xp_ops;
 	int		xp_addrlen;	 /* length of remote address */
 	struct sockaddr_in xp_raddr;	 /* rem. 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)(struct __rpc_svcxprt *, const unsigned,
+		bool_t  (*xp_control)(struct __rpc_svcxprt *,
-					   void *);
+					   const unsigned int, void *);
 	} *xp_ops2;
 	char		*xp_tp;		 /* transport provider device name */
 	char		*xp_netid;	 /* network token */
 	struct netbuf	xp_ltaddr;	 /* local transport address */
 	struct netbuf	xp_rtaddr;	 /* remote transport address */
 	struct opaque_auth xp_verf;	 /* raw response verifier */
 	void		*xp_p1;		 /* private: for use by svc ops */
 	void		*xp_p2;		 /* private: for use by svc ops */
 	void		*xp_p3;		 /* private: for use by svc lib */
 	int		xp_type;	 /* transport type */
 } SVCXPRT;
 /*
 @@ -377,70 +377,73 @@ extern SVCXPRT *svc_tp_create(void (*)(s
 				   const struct netconfig *);
 /*
  *	void (*dispatch)(...);		-- dispatch routine
  *	const rpcprog_t prognum;	-- program number
  *	const rpcvers_t versnum;	-- version number
  *	const struct netconfig *nconf;	-- netconfig structure
  */
 /*
  * Generic TLI create routine
  */
 extern SVCXPRT *svc_tli_create(const int, const struct netconfig *,
-				    const struct t_bind *, const unsigned,
+				    const struct t_bind *, const unsigned int,
-				    const unsigned);
+				    const unsigned int);
 /*
  *	const int fd;			-- connection end point
  *	const struct netconfig *nconf;	-- netconfig structure for network
  *	const struct t_bind *bindaddr;	-- local bind address
  *	const unsigned sendsz;		-- max sendsize
  *	const unsigned recvsz;		-- max recvsize
  */
 /*
  * Connectionless and connectionful create routines
  */
-extern SVCXPRT *svc_vc_create(const int, const unsigned, const unsigned);
+extern SVCXPRT *svc_vc_create(const int, const unsigned int,
 				const unsigned int);
 /*
  *	const int fd;			-- open connection end point
  *	const unsigned sendsize;	-- max send size
  *	const unsigned recvsize;	-- max recv size
  */
-extern SVCXPRT *svc_dg_create(const int, const unsigned, const unsigned);
+extern SVCXPRT *svc_dg_create(const int, const unsigned int,
 				const unsigned int);
 /*
  *	const int fd;			-- open connection
  *	const unsigned sendsize;	-- max send size
  *	const unsigned recvsize;	-- max recv size
  */
 /*
  * the routine takes any *open* connection
  * descriptor as its first input and is used for open connections.
  */
-extern SVCXPRT *svc_fd_create(const int, const unsigned, const unsigned);
+extern SVCXPRT *svc_fd_create(const int, const unsigned int,
 				const unsigned int);
 /*
  *	const int fd;			-- open connection end point
  *	const unsigned sendsize;	-- max send size
  *	const unsigned recvsize;	-- max recv size
  */
 /*
  * Memory based rpc (for speed check and testing)
  */
 extern SVCXPRT *svc_raw_create(void);
 /*
  * svc_dg_enable_cache() enables the cache on dg transports.
  */
-int svc_dg_enablecache(SVCXPRT *, const unsigned);
+int svc_dg_enablecache(SVCXPRT *, const unsigned int);
 __END_DECLS
 /* for backward compatibility */
 #include <rpc/svc_soc.h>
 #endif /* !_RPC_SVC_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svc_soc.h,v 1.3 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: svc_soc.h,v 1.4 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -83,33 +83,33 @@ __END_DECLS
 /*
  * Memory based rpc for testing and timing.
  */
 __BEGIN_DECLS
 extern SVCXPRT *svcraw_create(void);
 __END_DECLS
 /*
  * Udp based rpc.
  */
 __BEGIN_DECLS
 extern SVCXPRT *svcudp_create(int);
-extern SVCXPRT *svcudp_bufcreate(int, unsigned, unsigned);
+extern SVCXPRT *svcudp_bufcreate(int, unsigned int, unsigned int);
 extern int svcudp_enablecache(SVCXPRT *, unsigned long);
 __END_DECLS
 /*
  * Tcp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svctcp_create(int, unsigned, unsigned);
+extern SVCXPRT *svctcp_create(int, unsigned int, unsigned int);
 __END_DECLS
 /*
  * Fd based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcfd_create(int, unsigned, unsigned);
+extern SVCXPRT *svcfd_create(int, unsigned int, unsigned int);
 __END_DECLS
 #endif /* !_RPC_SVC_SOC_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xdr.h,v 1.28 2016/01/23 01:05:30 dholland Exp $	*/
+/*	$NetBSD: xdr.h,v 1.29 2016/01/23 02:34:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -94,44 +94,44 @@ enum xdr_op {
  * The XDR handle.
  * Contains operation which is being applied to the stream,
  * an operations vector for the paticular implementation (e.g. see xdr_mem.c),
  * and two private fields for the use of the particular impelementation.
  */
 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)(struct __rpc_xdr *, long *);
 		/* put a long to " */
 		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
 		/* get some bytes from " */
-		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, unsigned);
+		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, unsigned int);
 		/* put some bytes to " */
 		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *,
-					unsigned);
+					unsigned int);
 		/* returns bytes off from beginning */
 		unsigned (*x_getpostn)(struct __rpc_xdr *);
 		/* lets you reposition the stream */
-		bool_t  (*x_setpostn)(struct __rpc_xdr *, unsigned);
+		bool_t  (*x_setpostn)(struct __rpc_xdr *, unsigned int);
 		/* buf quick ptr to buffered data */
-		int32_t	*(*x_inline)(struct __rpc_xdr *, unsigned);
+		int32_t	*(*x_inline)(struct __rpc_xdr *, unsigned int);
 		/* free privates of this xdr_stream */
 		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 */
 	char * 		x_base;		/* private used for position info */
-	unsigned	x_handy;	/* extra private word */
+	unsigned int	x_handy;	/* extra private word */
 } XDR;
 /*
  * A xdrproc_t exists for each data type which is to be encoded or decoded.
+ *
  * The second argument to the xdrproc_t is a pointer to an opaque pointer.
  * The opaque pointer generally points to a structure of the data type
  * to be decoded.  If this pointer is 0, then the type routines should
  * allocate dynamic storage of the appropriate size and return it.
  */
 typedef	bool_t (*xdrproc_t)(XDR *, const void *);
 /*
 @@ -270,90 +270,92 @@ struct xdr_discrim {
 #define IXDR_PUT_BOOL(buf, v)		IXDR_PUT_LONG((buf), (v))
 #define IXDR_PUT_ENUM(buf, v)		IXDR_PUT_LONG((buf), (v))
 #define IXDR_PUT_U_LONG(buf, v)		IXDR_PUT_LONG((buf), (v))
 #define IXDR_PUT_SHORT(buf, v)		IXDR_PUT_LONG((buf), (v))
 #define IXDR_PUT_U_SHORT(buf, v)	IXDR_PUT_LONG((buf), (v))
 /*
  * These are the "generic" xdr routines.
  */
 __BEGIN_DECLS
 extern bool_t	xdr_void(void);
 extern bool_t	xdr_int(XDR *, int *);
-extern bool_t	xdr_u_int(XDR *, unsigned *);
+extern bool_t	xdr_u_int(XDR *, unsigned int *);
 extern bool_t	xdr_long(XDR *, long *);
 extern bool_t	xdr_u_long(XDR *, unsigned long *);
 extern bool_t	xdr_short(XDR *, short *);
 extern bool_t	xdr_u_short(XDR *, unsigned short *);
 extern bool_t	xdr_int16_t(XDR *, int16_t *);
 extern bool_t	xdr_u_int16_t(XDR *, uint16_t *);
 extern bool_t	xdr_int32_t(XDR *, int32_t *);
 extern bool_t	xdr_u_int32_t(XDR *, uint32_t *);
 extern bool_t	xdr_int64_t(XDR *, int64_t *);
 extern bool_t	xdr_u_int64_t(XDR *, uint64_t *);
 extern bool_t	xdr_bool(XDR *, bool_t *);
 extern bool_t	xdr_enum(XDR *, enum_t *);
-extern bool_t	xdr_array(XDR *, char **, unsigned *, unsigned, unsigned, xdrproc_t);
+extern bool_t	xdr_array(XDR *, char **, unsigned int *, unsigned int,
-extern bool_t	xdr_bytes(XDR *, char **, unsigned *, unsigned);
+			unsigned int, xdrproc_t);
-extern bool_t	xdr_opaque(XDR *, char *, unsigned);
+extern bool_t	xdr_bytes(XDR *, char **, unsigned int *, unsigned int);
-extern bool_t	xdr_string(XDR *, char **, unsigned);
+extern bool_t	xdr_opaque(XDR *, char *, unsigned int);
 extern bool_t	xdr_string(XDR *, char **, unsigned 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 *, unsigned char *);
-extern bool_t	xdr_vector(XDR *, char *, unsigned, unsigned, xdrproc_t);
+extern bool_t	xdr_vector(XDR *, char *, unsigned int, unsigned 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 **, unsigned, xdrproc_t);
+extern bool_t	xdr_reference(XDR *, char **, unsigned int, xdrproc_t);
-extern bool_t	xdr_pointer(XDR *, char **, unsigned, xdrproc_t);
+extern bool_t	xdr_pointer(XDR *, char **, unsigned int, xdrproc_t);
 extern bool_t	xdr_wrapstring(XDR *, char **);
 extern void	xdr_free(xdrproc_t, char *);
 extern bool_t	xdr_hyper(XDR *, longlong_t *);
 extern bool_t	xdr_u_hyper(XDR *, u_longlong_t *);
 extern bool_t	xdr_longlong_t(XDR *, longlong_t *);
 extern bool_t	xdr_u_longlong_t(XDR *, u_longlong_t *);
 extern unsigned long xdr_sizeof(xdrproc_t, void *);
 __END_DECLS
 /*
  * Common opaque bytes objects used by many rpc protocols;
  * declared here due to commonality.
  */
 #define MAX_NETOBJ_SZ 1024
 struct netobj {
-	unsigned n_len;
+	unsigned int n_len;
 	char	*n_bytes;
 };
 typedef struct netobj netobj;
 extern bool_t   xdr_netobj(XDR *, struct netobj *);
 /*
  * These are the public routines for the various implementations of
  * xdr streams.
  */
 __BEGIN_DECLS
 /* XDR using memory buffers */
-extern void   xdrmem_create(XDR *, char *, unsigned, enum xdr_op);
+extern void   xdrmem_create(XDR *, char *, unsigned int, enum xdr_op);
 /* XDR using stdio library */
 #ifdef _STDIO_H_
 extern void   xdrstdio_create(XDR *, FILE *, enum xdr_op);
 #endif
 /* XDR pseudo records for tcp */
-extern void   xdrrec_create(XDR *, unsigned, unsigned, char *,
+extern void   xdrrec_create(XDR *, unsigned int, unsigned int, char *,
 				int (*)(char *, char *, int),
 				int (*)(char *, char *, int));
 /* make end of xdr record */
 extern bool_t xdrrec_endofrecord(XDR *, int);
 /* move to beginning of next record */
 extern bool_t xdrrec_skiprecord(XDR *);
 /* true if no more input */
 extern bool_t xdrrec_eof(XDR *);
-extern unsigned xdrrec_readbytes(XDR *, caddr_t, unsigned);
+extern unsigned xdrrec_readbytes(XDR *, caddr_t, unsigned int);
 __END_DECLS
 #endif /* !_RPC_XDR_H_ */

 @@ -197,27 +197,27 @@ struct rpcb_rmtcallargs {
 % * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
 % * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
 % * be passed the XDR routine that knows the args' structure.  This routine
 % * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
 % * the application being called already knows the args structure.  So we use a
 % * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
 % * includes the args' XDR routine.
 % */
 %struct r_rpcb_rmtcallargs {
 %	rpcprog_t prog;
 %	rpcvers_t vers;
 %	rpcproc_t proc;
 %	struct {
-%		unsigned args_len;
+%		unsigned int args_len;
 %		const char *args_val;
 %	} args;
 %	xdrproc_t	xdr_args;	/* encodes args */
 %};
+%
 #endif	/* def RPC_HDR */
+%
 %/*
 % * Results of the remote call
 % */
 struct rpcb_rmtcallres {
 	string addr<>;			/* remote universal address */
 	opaque results<>;		/* result */