mirrors/zlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid attempting to redefine z_const in zconf.h.

Browse Source
This commit is contained in:
AlexisWilke 2024-10-13 08:46:47 -07:00 committed by Mark Adler
parent 64191119d8
commit 6d3a66a11a
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zconf.h
View File

@ -235,11 +235,13 @@
# endif # endif
#endif #endif
#if defined(ZLIB_CONST) && !defined(z_const) #ifndef z_const
# ifdef ZLIB_CONST
# define z_const const # define z_const const
# else # else
# define z_const # define z_const
# endif # endif
#endif
#ifdef Z_SOLO #ifdef Z_SOLO
# ifdef _WIN64 # ifdef _WIN64

4
zconf.h.cmakein
View File

@ -237,11 +237,13 @@
# endif # endif
#endif #endif
#if defined(ZLIB_CONST) && !defined(z_const) #ifndef z_const
# ifdef ZLIB_CONST
# define z_const const # define z_const const
# else # else
# define z_const # define z_const
# endif # endif
#endif
#ifdef Z_SOLO #ifdef Z_SOLO
# ifdef _WIN64 # ifdef _WIN64

4
zconf.h.in
View File

@ -235,11 +235,13 @@
# endif # endif
#endif #endif
#if defined(ZLIB_CONST) && !defined(z_const) #ifndef z_const
# ifdef ZLIB_CONST
# define z_const const # define z_const const
# else # else
# define z_const # define z_const
# endif # endif
#endif
#ifdef Z_SOLO #ifdef Z_SOLO
# ifdef _WIN64 # ifdef _WIN64