zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-10 14:41:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

deps: update zlib-ng to 2.0.7

Browse source
This commit is contained in:
alexey.lysiuk 2023-03-18 12:21:33 +02:00
parent d9b7140674
commit d5134af628
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
deps/zlib-ng/include/zconf.h vendored
View file

@ -85,6 +85,9 @@
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
*/ */
#if defined(ZLIB_WINAPI) && defined(_WIN32) #if defined(ZLIB_WINAPI) && defined(_WIN32)
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h> # include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */ /* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@ -114,7 +117,7 @@
# define ZEXPORTVA Z_EXPORTVA # define ZEXPORTVA Z_EXPORTVA
#endif #endif
/* Fallback for something that includes us. */ /* Legacy zlib typedefs for backwards compatibility. Don't assume stdint.h is defined. */
typedef unsigned char Byte; typedef unsigned char Byte;
typedef Byte Bytef; typedef Byte Bytef;
@ -130,6 +133,8 @@ typedef void const *voidpc;
typedef void *voidpf; typedef void *voidpf;
typedef void *voidp; typedef void *voidp;
typedef unsigned int z_crc_t;
#if 1 /* was set to #if 1 by configure/cmake/etc */ #if 1 /* was set to #if 1 by configure/cmake/etc */
# define Z_HAVE_UNISTD_H # define Z_HAVE_UNISTD_H
#endif #endif
@ -139,7 +144,6 @@ typedef PTRDIFF_TYPE ptrdiff_t;
#endif #endif
#include <sys/types.h> /* for off_t */ #include <sys/types.h> /* for off_t */
#include <stdarg.h> /* for va_list */
#include <stddef.h> /* for wchar_t and NULL */ #include <stddef.h> /* for wchar_t and NULL */

13
deps/zlib-ng/include/zlib.h vendored
View file

@ -36,6 +36,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdarg.h> #include <stdarg.h>
#include "zconf.h" #include "zconf.h"
#ifndef ZCONF_H #ifndef ZCONF_H
@ -46,11 +47,11 @@
extern "C" { extern "C" {
#endif #endif
#define ZLIBNG_VERSION "2.0.6" #define ZLIBNG_VERSION "2.0.7"
#define ZLIBNG_VERNUM 0x2060 #define ZLIBNG_VERNUM 0x2070
#define ZLIBNG_VER_MAJOR 2 #define ZLIBNG_VER_MAJOR 2
#define ZLIBNG_VER_MINOR 0 #define ZLIBNG_VER_MINOR 0
#define ZLIBNG_VER_REVISION 6 #define ZLIBNG_VER_REVISION 7
#define ZLIBNG_VER_SUBREVISION 0 #define ZLIBNG_VER_SUBREVISION 0
#define ZLIB_VERSION "1.2.11.zlib-ng" #define ZLIB_VERSION "1.2.11.zlib-ng"
@ -58,7 +59,7 @@ extern "C" {
#define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2 #define ZLIB_VER_MINOR 2
#define ZLIB_VER_REVISION 11 #define ZLIB_VER_REVISION 11
#define ZLIB_VER_SUBREVISION 0 #define ZLIB_VER_SUBREVISION 15 /* 15=fork (0xf) */
/* /*
The 'zlib' compression library provides in-memory compression and The 'zlib' compression library provides in-memory compression and
@ -1799,7 +1800,7 @@ Z_EXTERN int Z_EXPORT gzgetc_(gzFile file); /* backward compatibility */
#endif #endif
#endif #endif
#if !defined(Z_INTERNAL) && defined(Z_WANT64) #if !defined(Z_SOLO) && !defined(Z_INTERNAL) && defined(Z_WANT64)
# define gzopen gzopen64 # define gzopen gzopen64
# define gzseek gzseek64 # define gzseek gzseek64
# define gztell gztell64 # define gztell gztell64
@ -1817,10 +1818,12 @@ Z_EXTERN int Z_EXPORT gzgetc_(gzFile file); /* backward compatibility */
Z_EXTERN void Z_EXPORT crc32_combine_gen64(uint32_t *op, z_off64_t); Z_EXTERN void Z_EXPORT crc32_combine_gen64(uint32_t *op, z_off64_t);
# endif # endif
#else #else
# ifndef Z_SOLO
Z_EXTERN gzFile Z_EXPORT gzopen(const char *, const char *); Z_EXTERN gzFile Z_EXPORT gzopen(const char *, const char *);
Z_EXTERN z_off_t Z_EXPORT gzseek(gzFile, z_off_t, int); Z_EXTERN z_off_t Z_EXPORT gzseek(gzFile, z_off_t, int);
Z_EXTERN z_off_t Z_EXPORT gztell(gzFile); Z_EXTERN z_off_t Z_EXPORT gztell(gzFile);
Z_EXTERN z_off_t Z_EXPORT gzoffset(gzFile); Z_EXTERN z_off_t Z_EXPORT gzoffset(gzFile);
# endif
Z_EXTERN unsigned long Z_EXPORT adler32_combine(unsigned long, unsigned long, z_off_t); Z_EXTERN unsigned long Z_EXPORT adler32_combine(unsigned long, unsigned long, z_off_t);
Z_EXTERN unsigned long Z_EXPORT crc32_combine(unsigned long, unsigned long, z_off_t); Z_EXTERN unsigned long Z_EXPORT crc32_combine(unsigned long, unsigned long, z_off_t);
Z_EXTERN void Z_EXPORT crc32_combine_gen(uint32_t *op, z_off_t); Z_EXTERN void Z_EXPORT crc32_combine_gen(uint32_t *op, z_off_t);

BIN
deps/zlib-ng/lib/libz.a vendored
View file

Binary file not shown.

2
deps/zlib-ng/lib/pkgconfig/zlib.pc vendored
View file

@ -6,7 +6,7 @@ includedir=${prefix}/include
Name: zlib Name: zlib
Description: zlib-ng compression library Description: zlib-ng compression library
Version: 1.2.11 Version: 1.2.11.zlib-ng
Requires: Requires:
Libs: -L${libdir} -L${sharedlibdir} -lz Libs: -L${libdir} -L${sharedlibdir} -lz