Update.

	* sunrpc/xdr_sizeof.c (x_inline): Cleanup pointer assignments.

	* iconv/gconv_open.c: Include string.h for memset prototype.

diff --git a/ChangeLog b/ChangeLog
index f950dbd..c9c560f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 1999-06-18  Ulrich Drepper  <drepper@cygnus.com>
 
-       * 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 (file)
--- 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;
     }