From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 18 Jun 1999 18:31:58 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/pre-glibc-2_1_3~735
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ce1e7f91e4c94ec5348cb499d18e0951edf8f48;p=thirdparty%2Fglibc.git

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 f950dbd1786..c9c560f7423 100644
--- 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 faaea34fa37..cbf8bdfd1ee 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;
     }