From 70611700ff9b85f2816360a824a871c47d96c625 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 18 Jun 2010 09:36:02 +0000
Subject: [PATCH] =?UTF-8?q?2010-06-18=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
---
 cpukit/ChangeLog                       |  4 ++++
 cpukit/libfs/src/nfsclient/src/rpcio.c | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 018963923d..ad7a2d6d2e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
+
 2010-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* rtems/include/rtems/rtems/object.h: Remove OBJECTS_ITRON_API.
diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c
index d462774558..3316cccb5f 100644
--- a/cpukit/libfs/src/nfsclient/src/rpcio.c
+++ b/cpukit/libfs/src/nfsclient/src/rpcio.c
@@ -65,6 +65,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <rtems.h>
 #include <rtems/error.h>
 #include <rtems/rtems_bsdnet.h>
@@ -1658,7 +1660,7 @@ static RpcUdpXact
 sockRcv(void)
 {
 int					len,i;
-u_long				xid;
+uint32_t				xid;
 union {
 	struct sockaddr_in	sin;
 	struct sockaddr     sa;
@@ -1743,9 +1745,9 @@ RpcUdpXact			xact     = 0;
 #endif
 			} else {
 			fprintf(stderr,"RPCIO WARNING sockRcv(): transaction mismatch\n");
-			fprintf(stderr,"xact: xid  0x%08lx  -- got 0x%08lx\n",
+			fprintf(stderr,"xact: xid  0x%08" PRIx32 "  -- got 0x%08" PRIx32 "\n",
 							xact->obuf.xid, xid);
-			fprintf(stderr,"xact: addr 0x%08lx  -- got 0x%08lx\n",
+			fprintf(stderr,"xact: addr 0x%08" PRIx32 "  -- got 0x%08" PRIx32 "\n",
 							xact->server->addr.sin.sin_addr.s_addr,
 							fromAddr.sin.sin_addr.s_addr);
 			fprintf(stderr,"xact: port 0x%08x  -- got 0x%08x\n",
@@ -1754,7 +1756,7 @@ RpcUdpXact			xact     = 0;
 			}
 		} else {
 			fprintf(stderr,
-					"RPCIO WARNING sockRcv(): got xid 0x%08lx but its slot is empty\n",
+					"RPCIO WARNING sockRcv(): got xid 0x%08" PRIx32 " but its slot is empty\n",
 					xid);
 		}
 		/* forget about this one and try again */