diff options
author | Sergei Golubchik <serg@mariadb.org> | 2023-04-20 16:58:28 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2023-04-20 16:58:28 +0200 |
commit | 3bab137f58127c35c2eba5e052598bff5d59853b (patch) | |
tree | 61c3e8fc64cea7c556be3709806a32034fcbc13b /zlib/zconf.h.in | |
parent | 8b6739e4e328543b453a4a3337ef4a806cbd9c09 (diff) | |
download | mariadb-git-3bab137f58127c35c2eba5e052598bff5d59853b.tar.gz |
1.2.13
Diffstat (limited to 'zlib/zconf.h.in')
-rw-r--r-- | zlib/zconf.h.in | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/zlib/zconf.h.in b/zlib/zconf.h.in index 5e1d68a004e..bf977d3e70a 100644 --- a/zlib/zconf.h.in +++ b/zlib/zconf.h.in @@ -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 */ |