Fix merge errors.

diff --git a/compress.c b/compress.c
index 2e4c8d7fd56a5042d80fd53230adf4a14b86c875..31ffdb14a46ffe50bf65a572b1a42eeae95b10d8 100644 (file)
--- 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 d94d3d624bbc30013dedb8cb7eb8e97c7187aac2..9799eb991b28950ad022b21a63d3ed48f5ae4b84 100644 (file)
--- 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;