Avoid attempting to redefine z_const in zconf.h.

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

10
zconf.h
View File

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

View File

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

View File

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