From: Mark Adler <madler@alumni.caltech.edu>
Date: Tue, 31 Jan 2012 07:55:14 +0000 (-0800)
Subject: Fix problem with ./configure --prefix and gzgetc macro.
X-Git-Tag: v1.2.6.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98e5787e1b22c2f974e3e80eda135abe7e008251;p=thirdparty%2Fzlib-ng.git

Fix problem with ./configure --prefix and gzgetc macro.
---

diff --git a/zlib.h b/zlib.h
index 43d58b6ba..72252b53f 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1651,8 +1651,14 @@ struct gzFile_s {
     z_off64_t pos;
 };
 ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
-#define gzgetc(g) \
-    ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
+#endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
  * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if