diff --git a/deps/miniz/miniz.c b/deps/miniz/miniz.c index ccce3ed750..38e4a40ccd 100644 --- a/deps/miniz/miniz.c +++ b/deps/miniz/miniz.c @@ -254,7 +254,7 @@ int mz_inflate(mz_streamp pStream, int flush) return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK; } -int inflateEnd(mz_streamp pStream) +int mz_inflateEnd(mz_streamp pStream) { if (!pStream) return MZ_STREAM_ERROR; @@ -287,12 +287,12 @@ int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char status = mz_inflate(&stream, MZ_FINISH); if (status != MZ_STREAM_END) { - inflateEnd(&stream); + mz_inflateEnd(&stream); return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status; } *pDest_len = stream.total_out; - return inflateEnd(&stream); + return mz_inflateEnd(&stream); } const char *mz_error(int err) diff --git a/deps/miniz/zlib.h b/deps/miniz/zlib.h index 3de0b6821c..eeb01ac6c9 100644 --- a/deps/miniz/zlib.h +++ b/deps/miniz/zlib.h @@ -342,7 +342,7 @@ int mz_inflateInit2(mz_streamp pStream, int window_bits); int mz_inflate(mz_streamp pStream, int flush); // Deinitializes a decompressor. -int inflateEnd(mz_streamp pStream); +int mz_inflateEnd(mz_streamp pStream); // Single-call decompression. // Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure. @@ -409,6 +409,7 @@ const char *mz_error(int err); #define inflateInit mz_inflateInit #define inflateInit2 mz_inflateInit2 #define inflate mz_inflate + #define inflateEnd mz_inflateEnd #define uncompress mz_uncompress #define crc32 crc32 #define adler32 mz_adler32