From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 13 Oct 2014 07:49:46 +0000 (+0900)
Subject: Fix build failure without zlib.
X-Git-Tag: v3.1.900a~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=481b432ec18905afa679e3249185eff9830f9804;p=thirdparty%2Flibarchive.git

Fix build failure without zlib.
---

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 3bd9afdb3..6609b072e 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -325,7 +325,7 @@ crypt_derive_key_sha1(const void *p, int size, unsigned char *key,
 static unsigned long
 real_crc32(unsigned long crc, const void *buff, size_t len)
 {
-	return crc32(crc, buff, (uInt)len);
+	return crc32(crc, buff, (unsigned int)len);
 }
 
 static unsigned long
diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 252d0af85..00463fac8 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -232,7 +232,7 @@ cd_alloc(struct zip *zip, size_t length)
 static unsigned long
 real_crc32(unsigned long crc, const void *buff, size_t len)
 {
-	return crc32(crc, buff, (uInt)len);
+	return crc32(crc, buff, (unsigned int)len);
 }
 
 static unsigned long