diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-18 20:24:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-18 20:24:43 (GMT) |
| commit | 6a9dc785dc6069702330f2a6ec66b1717afbfbd7 (patch) | |
| tree | 226868b4f0c2ccc905b6db60338e82195cf6be44 /compat/zlib/zconf.h | |
| parent | c271044702cbeb60132593ac125711cfc557f67d (diff) | |
| download | tcl-6a9dc785dc6069702330f2a6ec66b1717afbfbd7.zip tcl-6a9dc785dc6069702330f2a6ec66b1717afbfbd7.tar.gz tcl-6a9dc785dc6069702330f2a6ec66b1717afbfbd7.tar.bz2 | |
Update to zlib-1.2.13
Diffstat (limited to 'compat/zlib/zconf.h')
| -rw-r--r-- | compat/zlib/zconf.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/compat/zlib/zconf.h b/compat/zlib/zconf.h index 5e1d68a..bf977d3 100644 --- a/compat/zlib/zconf.h +++ b/compat/zlib/zconf.h @@ -38,6 +38,9 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 +# define crc32_combine_gen z_crc32_combine_gen +# define crc32_combine_gen64 z_crc32_combine_gen64 +# define crc32_combine_op z_crc32_combine_op # define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound @@ -349,6 +352,9 @@ # ifdef FAR # undef FAR # endif +# 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. */ @@ -467,11 +473,18 @@ typedef uLong FAR uLongf; # undef _LARGEFILE64_SOURCE #endif -#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) -# define Z_HAVE_UNISTD_H +#ifndef Z_HAVE_UNISTD_H +# ifdef __WATCOMC__ +# define Z_HAVE_UNISTD_H +# endif +#endif +#ifndef Z_HAVE_UNISTD_H +# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32) +# define Z_HAVE_UNISTD_H +# endif #endif #ifndef Z_SOLO -# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# if defined(Z_HAVE_UNISTD_H) # include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ # ifdef VMS # include <unixio.h> /* for off_t */ |