svn commit: r194224 - user/kmacy/releng_7_2_fcs/sys/libkern/zlib

[Kip Macy]

Author: kmacy
Date: Sun Jun 14 23:32:43 2009
New Revision: 194224
URL: http://svn.freebsd.org/changeset/base/194224

Log:
  fix const warnings

Modified:
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/uncompr.c
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zlib.h
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/uncompr.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/uncompr.c	Sun Jun 14 23:29:07 2009	(r194223)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/uncompr.c	Sun Jun 14 23:32:43 2009	(r194224)
@@ -32,7 +32,7 @@ int ZEXPORT uncompress (dest, destLen, s
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (Bytef*)(uintptr_t)source;
     stream.avail_in = (uInt)sourceLen;
     /* Check for source > 64K on 16-bit machine: */
     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zlib.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zlib.h	Sun Jun 14 23:29:07 2009	(r194223)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zlib.h	Sun Jun 14 23:32:43 2009	(r194224)
@@ -30,7 +30,7 @@
 
 #ifndef ZLIB_H
 #define ZLIB_H
-
+#include <sys/types.h>
 #include <libkern/zlib/zconf.h>
 
 #ifdef __cplusplus

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h	Sun Jun 14 23:29:07 2009	(r194223)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h	Sun Jun 14 23:32:43 2009	(r194224)
@@ -61,7 +61,7 @@ extern const char * const z_errmsg[10]; 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
+	return (strm->msg = (char*)(uintptr_t)ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
         /* common constants */