diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2012-01-30 23:55:14 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2012-01-30 23:55:14 -0800 |
commit | 98e5787e1b22c2f974e3e80eda135abe7e008251 (patch) | |
tree | 24fd9eea7466ed72d42b6ae742259f6b03b13114 | |
parent | 3fb727c34d2f499ba8fb22771dc42564383e902e (diff) | |
download | zlib-98e5787e1b22c2f974e3e80eda135abe7e008251.tar.gz zlib-98e5787e1b22c2f974e3e80eda135abe7e008251.tar.bz2 zlib-98e5787e1b22c2f974e3e80eda135abe7e008251.zip |
Fix problem with ./configure --prefix and gzgetc macro.
-rw-r--r-- | zlib.h | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1651,8 +1651,14 @@ struct gzFile_s { | |||
1651 | z_off64_t pos; | 1651 | z_off64_t pos; |
1652 | }; | 1652 | }; |
1653 | ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); | 1653 | ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); |
1654 | #define gzgetc(g) \ | 1654 | #ifdef Z_PREFIX_SET |
1655 | ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g)) | 1655 | # undef z_gzgetc |
1656 | # define z_gzgetc(g) \ | ||
1657 | ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g)) | ||
1658 | #else | ||
1659 | # define gzgetc(g) \ | ||
1660 | ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g)) | ||
1661 | #endif | ||
1656 | 1662 | ||
1657 | /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or | 1663 | /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or |
1658 | * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if | 1664 | * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if |