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

Use prefix when Z_PREFIX is defined for z_errmsg too

Browse Source 
Even though this variable does already have a "z_" prefix, it still
needs to be renamed when Z_PREFIX is defined to avoid name conflicts
between the standard build of zlib, not using the prefix, and custom
ones, if both happen to be linked into the same executable.
This commit is contained in:
Vadim Zeitlin 2017-12-07 23:29:46 +01:00
parent 1c1550729c
commit 478f9ec904
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zconf.h
View File

@ -168,6 +168,8 @@
# define gz_header_s z_gz_header_s # define gz_header_s z_gz_header_s
# define internal_state z_internal_state # define internal_state z_internal_state
/* variable from zutil.h */
# define z_errmsg z_z_errmsg
#endif #endif
#if defined(__MSDOS__) && !defined(MSDOS) #if defined(__MSDOS__) && !defined(MSDOS)

2
zconf.h.cmakein
View File

@ -165,6 +165,8 @@
# define gz_header_s z_gz_header_s # define gz_header_s z_gz_header_s
# define internal_state z_internal_state # define internal_state z_internal_state
/* variable from zutil.h */
# define z_errmsg z_z_errmsg
#endif #endif
#if defined(__MSDOS__) && !defined(MSDOS) #if defined(__MSDOS__) && !defined(MSDOS)

2
zconf.h.in
View File

@ -163,6 +163,8 @@
# define gz_header_s z_gz_header_s # define gz_header_s z_gz_header_s
# define internal_state z_internal_state # define internal_state z_internal_state
/* variable from zutil.h */
# define z_errmsg z_z_errmsg
#endif #endif
#if defined(__MSDOS__) && !defined(MSDOS) #if defined(__MSDOS__) && !defined(MSDOS)