From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 12 May 2015 09:42:45 +0000 (+0200)
Subject: Fix merge conflicts
X-Git-Tag: 1.9.9-b1~840
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c4e9bf324a5cdf1f1c302b0a532953287f23ac1;p=thirdparty%2Fzlib-ng.git

Fix merge conflicts
---

diff --git a/zlib.h b/zlib.h
index 201ea4c9d..00e3b150e 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1723,8 +1723,8 @@ ZEXTERN int ZEXPORT gzgetc_ (gzFile file);  /* backward compatibility */
 
 #else /* !WITH_GZFILEOP */
 
-   ZEXTERN uLong ZEXPORT adler32_combine (uLong, uLong, z_off_t);
-   ZEXTERN uLong ZEXPORT crc32_combine (uLong, uLong, z_off_t);
+   ZEXTERN uint32_t ZEXPORT adler32_combine (uint32_t, uint32_t, z_off_t);
+   ZEXTERN uint32_t ZEXPORT crc32_combine (uint32_t, uint32_t, z_off_t);
 
 #endif /* WITH_GZFILEOP */