From 9324da2036f959668c4b0c7e408f89a1fff44f23 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sat, 24 Aug 2024 12:18:55 +0000 Subject: [PATCH] ffi: avoid loading 2 different zlib libraries (#1912) Avoid loading the system version instead of ours. --- ffi/zipwriter.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ffi/zipwriter.lua b/ffi/zipwriter.lua index cdbcddad9..d8f0ed74d 100644 --- a/ffi/zipwriter.lua +++ b/ffi/zipwriter.lua @@ -14,7 +14,14 @@ local ffi = require "ffi" require "ffi/zlib_h" -- We only need to wrap 2 zlib functions to make a zip file -local _zlib = ffi.load(ffi.os == "Windows" and "zlib1" or "z") +local _zlib +if ffi.os == "Windows" then + _zlib = ffi.load("libs/libz1.dll") +elseif ffi.os == "OSX" then + _zlib = ffi.load("libs/libz.1.dylib") +else + _zlib = ffi.load("libs/libz.so.1") +end local function zlibCompress(data) local n = _zlib.compressBound(#data) local buf = ffi.new("uint8_t[?]", n)