From 5ce1e7f91e4c94ec5348cb499d18e0951edf8f48 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 18 Jun 1999 18:31:58 +0000 Subject: [PATCH] Update. * sunrpc/xdr_sizeof.c (x_inline): Cleanup pointer assignments. * iconv/gconv_open.c: Include string.h for memset prototype. --- ChangeLog | 4 +++- sunrpc/xdr_sizeof.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f950dbd..c9c560f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1999-06-18 Ulrich Drepper - * iconv/gconv_open.c: Inlcude string.h for memset prototype. + * sunrpc/xdr_sizeof.c (x_inline): Cleanup pointer assignments. + + * iconv/gconv_open.c: Include string.h for memset prototype. * libio/libioP.h (FILEBUF_LITERAL): Add missing parameter to macro definitions. diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c index faaea34..cbf8bdf 100644 --- a/sunrpc/xdr_sizeof.c +++ b/sunrpc/xdr_sizeof.c @@ -77,7 +77,7 @@ x_inline (XDR *xdrs, int len) return NULL; if (xdrs->x_op != XDR_ENCODE) return NULL; - if (len < (int) xdrs->x_base) + if (len < (int) (long int) xdrs->x_base) { /* x_private was already allocated */ xdrs->x_handy += len; @@ -93,7 +93,7 @@ x_inline (XDR *xdrs, int len) xdrs->x_base = 0; return NULL; } - xdrs->x_base = (caddr_t) len; + xdrs->x_base = (void *) len; xdrs->x_handy += len; return (int32_t *) xdrs->x_private; } -- 2.7.4