diff options
| -rw-r--r-- | cpukit/ChangeLog | 3 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/rpcio.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 86989f1835..93d0402f8b 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,8 @@ 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/nfsclient/src/rpcio.c: + Cast pointers to uintptr_t instead of long. + xids are uint32_t not u_long. * libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK, NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number. diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c index c8b0189c71..cf51a8bf3e 100644 --- a/cpukit/libfs/src/nfsclient/src/rpcio.c +++ b/cpukit/libfs/src/nfsclient/src/rpcio.c @@ -288,7 +288,7 @@ typedef struct RpcUdpServerRec_ { } RpcUdpServerRec; typedef union RpcBufU_ { - u_long xid; + uint32_t xid; char buf[1]; } RpcBufU, *RpcBuf; @@ -687,9 +687,9 @@ register int i,j; return 0; } /* pick a free table slot and initialize the XID */ - rval->obuf.xid = time(0) ^ (unsigned long)rval; + rval->obuf.xid = time(0) ^ (uintptr_t)rval; MU_LOCK(hlock); - rval->obuf.xid = (xidHashSeed++ ^ ((unsigned long)rval>>10)) & XACT_HASH_MSK; + rval->obuf.xid = (xidHashSeed++ ^ ((uintptr_t)rval>>10)) & XACT_HASH_MSK; i=j=(rval->obuf.xid & XACT_HASH_MSK); if (msgQ) { /* if there's no message queue, refuse to |