diff options
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/librpc/src/rpc/clnt_udp.c | 4 | ||||
| -rw-r--r-- | cpukit/librpc/src/xdr/xdr_mem.c | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0475377301..93ef4a44b3 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2010-04-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * librpc/src/rpc/clnt_udp.c, librpc/src/xdr/xdr_mem.c: + Use [u]intptr_t instead of [u_]long for better 16bit compliance. + +2010-04-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * aclocal/enable-itron.m4, aclocal/check-itron.m4: Replace RTEMS_HAS_ITRON_API with enable_itron. * librpc/src/rpc/pmap_rmt.c: Use uintptr_t for better 16bit diff --git a/cpukit/librpc/src/rpc/clnt_udp.c b/cpukit/librpc/src/rpc/clnt_udp.c index 623500fb75..84737c298c 100644 --- a/cpukit/librpc/src/rpc/clnt_udp.c +++ b/cpukit/librpc/src/rpc/clnt_udp.c @@ -123,10 +123,10 @@ clntudp_bufcreate( register struct cu_data *cu = NULL; struct timeval now; struct rpc_msg call_msg; - static u_int32_t disrupt; + static uintptr_t disrupt; if (disrupt == 0) - disrupt = (u_int32_t)(long)raddr; + disrupt = (uintptr_t)raddr; cl = (CLIENT *)mem_alloc(sizeof(CLIENT)); if (cl == NULL) { diff --git a/cpukit/librpc/src/xdr/xdr_mem.c b/cpukit/librpc/src/xdr/xdr_mem.c index 3d8501ec78..df8299dfb2 100644 --- a/cpukit/librpc/src/xdr/xdr_mem.c +++ b/cpukit/librpc/src/xdr/xdr_mem.c @@ -202,7 +202,7 @@ xdrmem_getpos( { /* XXX w/64-bit pointers, u_int not enough! */ - return ((u_long)xdrs->x_private - (u_long)xdrs->x_base); + return ((uintptr_t)xdrs->x_private - (uintptr_t)xdrs->x_base); } static bool_t @@ -213,10 +213,10 @@ xdrmem_setpos( register caddr_t newaddr = xdrs->x_base + pos; register caddr_t lastaddr = xdrs->x_private + xdrs->x_handy; - if ((long)newaddr > (long)lastaddr) + if ((intptr_t)newaddr > (intptr_t)lastaddr) return (FALSE); xdrs->x_private = newaddr; - xdrs->x_handy = (long)lastaddr - (long)newaddr; + xdrs->x_handy = (intptr_t)lastaddr - (intptr_t)newaddr; return (TRUE); } |