aboutsummaryrefslogtreecommitdiffstats
path: root/zlib
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2003-08-21 23:28:24 +0000
committerWayne Davison <wayned@samba.org>2003-08-21 23:28:24 +0000
commitb017ec4e1342e9149384fecc44747d96b03f60cd (patch)
treea8a3f24df2e9ca7036252cc48130026a45b46678 /zlib
parent2c873122b371f7504e025e9676d6e6b9e9e6e9af (diff)
downloadandroid_external_rsync-b017ec4e1342e9149384fecc44747d96b03f60cd.tar.gz
android_external_rsync-b017ec4e1342e9149384fecc44747d96b03f60cd.tar.bz2
android_external_rsync-b017ec4e1342e9149384fecc44747d96b03f60cd.zip
Silenced a couple compiler warnings.
Diffstat (limited to 'zlib')
-rw-r--r--zlib/inftrees.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/inftrees.c b/zlib/inftrees.c
index 4c32ca30..a4d86a85 100644
--- a/zlib/inftrees.c
+++ b/zlib/inftrees.c
@@ -213,7 +213,7 @@ uIntf *v; /* working area: values in order of bit length */
/* compute minimum size table less than or equal to l bits */
z = g - w;
- z = z > (uInt)l ? l : z; /* table size upper limit */
+ z = z > (uInt)l ? (uInt)l : z; /* table size upper limit */
if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */
{ /* too few codes for k-w bit table */
f -= a + 1; /* deduct codes from patterns left */
@@ -400,7 +400,7 @@ uIntf *bl; /* literal desired/actual bit depth */
uIntf *bd; /* distance desired/actual bit depth */
inflate_huft * FAR *tl; /* literal/length tree result */
inflate_huft * FAR *td; /* distance tree result */
-z_streamp z; /* for memory allocation */
+UNUSED(z_streamp z); /* for memory allocation */
{
#ifdef BUILDFIXED
/* build fixed tables if not already */