From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 3 Nov 2015 18:35:54 +0000 (+0100)
Subject: Fix merge errors.
X-Git-Tag: 1.9.9-b1~793^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8c8743112b124f09931ed61bd5ca3c793723002;p=thirdparty%2Fzlib-ng.git

Fix merge errors.
---

diff --git a/compress.c b/compress.c
index 2e4c8d7fd..31ffdb14a 100644
--- a/compress.c
+++ b/compress.c
@@ -39,7 +39,7 @@ int ZEXPORT compress2(unsigned char *dest, uLong *destLen, const unsigned char *
 
     stream.next_out = dest;
     stream.avail_out = 0;
-    stream.next_in = (z_const Bytef *)source;
+    stream.next_in = (const unsigned char *)source;
     stream.avail_in = 0;
 
     do {
diff --git a/uncompr.c b/uncompr.c
index d94d3d624..9799eb991 100644
--- a/uncompr.c
+++ b/uncompr.c
@@ -38,11 +38,11 @@ int ZEXPORT uncompress(unsigned char *dest, uLong *destLen, const unsigned char
         dest = buf;
     }
 
-    stream.next_in = (z_const Bytef *)source;
+    stream.next_in = (const unsigned char *)source;
     stream.avail_in = 0;
     stream.zalloc = (alloc_func)0;
     stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
+    stream.opaque = (void *)0;
 
     err = inflateInit(&stream);
     if (err != Z_OK) return err;