diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-01-17 08:20:21 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-01-17 08:20:21 +0100 |
| commit | b804c4b72c96630d57166d4d7b94fb104122e95e (patch) | |
| tree | d201716df848c30dbf1f41ce1836996474fea8cc /zlib/zconf.h | |
| parent | 71eda122e8649df6f78e8972119c161c75a2056b (diff) | |
Update bundled zlib to version 1.2.13 (13 oct 2022)
Diffstat (limited to 'zlib/zconf.h')
| -rw-r--r-- | zlib/zconf.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/zlib/zconf.h b/zlib/zconf.h index 74f052698..6c1e342c6 100644 --- a/zlib/zconf.h +++ b/zlib/zconf.h @@ -51,6 +51,9 @@ # define crc32 fltk_z_crc32 # define crc32_combine fltk_z_crc32_combine # define crc32_combine64 fltk_z_crc32_combine64 +# define crc32_combine_gen fltk_z_crc32_combine_gen +# define crc32_combine_gen64 fltk_z_crc32_combine_gen64 +# define crc32_combine_op fltk_z_crc32_combine_op # define crc32_z fltk_z_crc32_z # define deflate fltk_z_deflate # define deflateBound fltk_z_deflateBound @@ -362,6 +365,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. */ @@ -480,11 +486,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 */ |