diff options
Diffstat (limited to 'zconf.h.in')
| -rw-r--r-- | zconf.h.in | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -85,6 +85,9 @@ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. */ #if defined(ZLIB_WINAPI) && defined(_WIN32) +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif # include <windows.h> /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ @@ -114,7 +117,7 @@ # define ZEXPORTVA Z_EXPORTVA #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 Byte Bytef; @@ -130,6 +133,8 @@ typedef void const *voidpc; typedef void *voidpf; typedef void *voidp; +typedef unsigned int z_crc_t; + #ifdef HAVE_UNISTD_H /* may be set to #if 1 by configure/cmake/etc */ # define Z_HAVE_UNISTD_H #endif @@ -139,7 +144,6 @@ typedef PTRDIFF_TYPE ptrdiff_t; #endif #include <sys/types.h> /* for off_t */ -#include <stdarg.h> /* for va_list */ #include <stddef.h> /* for wchar_t and NULL */ |