From 3970769d84c247efab8e1587d9299e4969fe02dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Poizl?= <nou.spiro@gmail.com>
Date: Fri, 10 Mar 2023 22:21:03 +0100
Subject: [PATCH] Make bundled zlib use zconf.h

---
 CMakeLists.txt | 3 +++
 libxisf.cpp    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bc9a2d..7be90cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,9 @@ set(THIRD_PARTY_SRC
     zlib/trees.c
     zlib/uncompr.c
     zlib/zutil.c)
+    set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
 else(USE_BUNDLED_LIBS)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
diff --git a/libxisf.cpp b/libxisf.cpp
index e21fc4f..8d45289 100644
--- a/libxisf.cpp
+++ b/libxisf.cpp
@@ -131,7 +131,7 @@ void DataBlock::decompress(const ByteArray &input, const String &encoding)
     case Zlib:
     {
         data.resize(uncompressedSize);
-        uint64_t size = uncompressedSize;
+        uLongf size = uncompressedSize;
         ::uncompress((Bytef*)data.data(), &size, (Bytef*)tmp.data(), tmp.size());
         break;
     }
@@ -169,7 +169,7 @@ void DataBlock::compress(int sampleFormatSize)
     case Zlib:
     {
         data.resize(compressBound(uncompressedSize));
-        size_t compressedSize = data.size();
+        uLongf compressedSize = data.size();
         if(::compress2((Bytef*)data.data(), &compressedSize, (Bytef*)tmp.data(), tmp.size(), compressLevel) != Z_OK)
             throw Error("Zlib compression failed");
         data.resize(compressedSize);