diff --git a/deps/zlib-ng/include/zlib.h b/deps/zlib-ng/include/zlib.h index cddf92a4..a593c47f 100644 --- a/deps/zlib-ng/include/zlib.h +++ b/deps/zlib-ng/include/zlib.h @@ -46,11 +46,11 @@ extern "C" { #endif -#define ZLIBNG_VERSION "2.0.5" -#define ZLIBNG_VERNUM 0x2050 +#define ZLIBNG_VERSION "2.0.6" +#define ZLIBNG_VERNUM 0x2060 #define ZLIBNG_VER_MAJOR 2 #define ZLIBNG_VER_MINOR 0 -#define ZLIBNG_VER_REVISION 5 +#define ZLIBNG_VER_REVISION 6 #define ZLIBNG_VER_SUBREVISION 0 #define ZLIB_VERSION "1.2.11.zlib-ng" @@ -1766,6 +1766,7 @@ Z_EXTERN int Z_EXPORT inflateBackInit_(z_stream *strm, int windowBits, unsigned inflateBackInit_((strm), (windowBits), (window), ZLIB_VERSION, (int)sizeof(z_stream)) +#ifndef Z_SOLO /* gzgetc() macro and its supporting function and exposed data structure. Note * that the real internal state is much larger than the exposed structure. * This abbreviated structure exposes just enough for the gzgetc() macro. The @@ -1796,6 +1797,7 @@ Z_EXTERN int Z_EXPORT gzgetc_(gzFile file); /* backward compatibility */ Z_EXTERN unsigned long Z_EXPORT crc32_combine64(unsigned long, unsigned long, z_off64_t); Z_EXTERN void Z_EXPORT crc32_combine_gen64(uint32_t *op, z_off64_t); #endif +#endif #if !defined(Z_INTERNAL) && defined(Z_WANT64) # define gzopen gzopen64 @@ -1834,10 +1836,12 @@ Z_EXTERN unsigned long Z_EXPORT inflateCodesUsed (z_stream *); Z_EXTERN int Z_EXPORT inflateResetKeep (z_stream *); Z_EXTERN int Z_EXPORT deflateResetKeep (z_stream *); +#ifndef Z_SOLO #if defined(_WIN32) Z_EXTERN gzFile Z_EXPORT gzopen_w(const wchar_t *path, const char *mode); #endif Z_EXTERN int Z_EXPORTVA gzvprintf(gzFile file, const char *format, va_list va); +#endif #ifdef __cplusplus } diff --git a/deps/zlib-ng/lib/libz.a b/deps/zlib-ng/lib/libz.a index 75de88f7..cc0e8ea4 100644 Binary files a/deps/zlib-ng/lib/libz.a and b/deps/zlib-ng/lib/libz.a differ