Fix merge conflicts

diff --git a/zlib.h b/zlib.h
index 201ea4c9d95d6d2f0db54da9a434efabb474f799..00e3b150e5dadd188c881deb28ecdc0d74539bea 100644 (file)
--- 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 */