From owner-svn-src-user@FreeBSD.ORG  Sun Jun 14 23:32:43 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD14B106566B;
	Sun, 14 Jun 2009 23:32:43 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BC1A88FC08;
	Sun, 14 Jun 2009 23:32:43 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ENWhL5065354;
	Sun, 14 Jun 2009 23:32:43 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ENWhTx065351;
	Sun, 14 Jun 2009 23:32:43 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906142332.n5ENWhTx065351@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 14 Jun 2009 23:32:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194224 - user/kmacy/releng_7_2_fcs/sys/libkern/zlib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 23:32:44 -0000

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 */