2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>

	* librpc/include/rpc/clnt.h, librpc/include/rpc/rpc_msg.h,
	librpc/src/rpc/clnt_generic.c, librpc/src/rpc/clnt_raw.c,
	librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c,
	librpc/src/rpc/pmap_clnt.c, librpc/src/rpc/pmap_getmaps.c
	librpc/src/rpc/pmap_getport.c:
	Partial merger from freebsd (portability fixes).

1 files changed, 8 insertions, 8 deletions

diff --git a/cpukit/librpc/include/rpc/rpc_msg.h b/cpukit/librpc/include/rpc/rpc_msg.h
index 311d4f6863..21fcb841a1 100644
--- a/cpukit/librpc/include/rpc/rpc_msg.h
+++ b/cpukit/librpc/include/rpc/rpc_msg.h
@@ -92,8 +92,8 @@ struct accepted_reply {
 	enum accept_stat	ar_stat;
 	union {
 		struct {
-			u_int32_t	low;
-			u_int32_t	high;
+			rpcvers_t low;
+			rpcvers_t high;
 		} AR_versions;
 		struct {
 			caddr_t	where;
@@ -112,8 +112,8 @@ struct rejected_reply {
 	enum reject_stat rj_stat;
 	union {
 		struct {
-			u_int32_t low;
-			u_int32_t high;
+			rpcvers_t low;
+			rpcvers_t high;
 		} RJ_versions;
 		enum auth_stat RJ_why;  /* why authentication did not work */
 	} ru;
@@ -138,10 +138,10 @@ struct reply_body {
  * Body of an rpc request call.
  */
 struct call_body {
-	u_int32_t cb_rpcvers;	/* must be equal to two */
-	u_int32_t cb_prog;
-	u_int32_t cb_vers;
-	u_int32_t cb_proc;
+	rpcvers_t cb_rpcvers;	/* must be equal to two */
+	rpcprog_t cb_prog;
+	rpcvers_t cb_vers;
+	rpcproc_t cb_proc;
 	struct opaque_auth cb_cred;
 	struct opaque_auth cb_verf; /* protocol specific - provided by client */
 };