aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gzread.c10
-rw-r--r--zlib.h5
2 files changed, 4 insertions, 11 deletions
diff --git a/gzread.c b/gzread.c
index 46d40e0..e257867 100644
--- a/gzread.c
+++ b/gzread.c
@@ -373,7 +373,8 @@ int ZEXPORT gzread(file, buf, len)
373} 373}
374 374
375/* -- see zlib.h -- */ 375/* -- see zlib.h -- */
376int ZEXPORT gzgetc_(file) 376#undef gzgetc
377int ZEXPORT gzgetc(file)
377 gzFile file; 378 gzFile file;
378{ 379{
379 int ret; 380 int ret;
@@ -402,13 +403,6 @@ int ZEXPORT gzgetc_(file)
402 return ret < 1 ? -1 : buf[0]; 403 return ret < 1 ? -1 : buf[0];
403} 404}
404 405
405#undef gzgetc
406int ZEXPORT gzgetc(file)
407gzFile file;
408{
409 return gzgetc_(file);
410}
411
412/* -- see zlib.h -- */ 406/* -- see zlib.h -- */
413int ZEXPORT gzungetc(c, file) 407int ZEXPORT gzungetc(c, file)
414 int c; 408 int c;
diff --git a/zlib.h b/zlib.h
index bab908a..3d3ab71 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1650,14 +1650,13 @@ struct gzFile_s {
1650 unsigned char *next; 1650 unsigned char *next;
1651 z_off64_t pos; 1651 z_off64_t pos;
1652}; 1652};
1653ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
1654#ifdef Z_PREFIX_SET 1653#ifdef Z_PREFIX_SET
1655# undef z_gzgetc 1654# undef z_gzgetc
1656# define z_gzgetc(g) \ 1655# define z_gzgetc(g) \
1657 ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g)) 1656 ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
1658#else 1657#else
1659# define gzgetc(g) \ 1658# define gzgetc(g) \
1660 ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g)) 1659 ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
1661#endif 1660#endif
1662 1661
1663/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or 1662/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or