From 478f9ec9043fb1a0404394ae58dde0698dbe54eb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 7 Dec 2017 23:29:46 +0100 Subject: [PATCH] Use prefix when Z_PREFIX is defined for z_errmsg too 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. --- zconf.h | 2 ++ zconf.h.cmakein | 2 ++ zconf.h.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/zconf.h b/zconf.h index dda00da..92fb4c0 100644 --- a/zconf.h +++ b/zconf.h @@ -168,6 +168,8 @@ # define gz_header_s z_gz_header_s # define internal_state z_internal_state +/* variable from zutil.h */ +# define z_errmsg z_z_errmsg #endif #if defined(__MSDOS__) && !defined(MSDOS) diff --git a/zconf.h.cmakein b/zconf.h.cmakein index a7f24cc..853daf2 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -165,6 +165,8 @@ # define gz_header_s z_gz_header_s # define internal_state z_internal_state +/* variable from zutil.h */ +# define z_errmsg z_z_errmsg #endif #if defined(__MSDOS__) && !defined(MSDOS) diff --git a/zconf.h.in b/zconf.h.in index 5e1d68a..3ed18f0 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -163,6 +163,8 @@ # define gz_header_s z_gz_header_s # define internal_state z_internal_state +/* variable from zutil.h */ +# define z_errmsg z_z_errmsg #endif #if defined(__MSDOS__) && !defined(MSDOS)