From 1a4ba8cd912466fe538f62d61fbcc25eead6d31a Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 10 Feb 2012 23:55:12 -0800 Subject: [PATCH] Remove unnecessary gzgetc_ function. --- gzread.c | 10 ++-------- zlib.h | 5 ++--- 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) } /* -- see zlib.h -- */ -int ZEXPORT gzgetc_(file) +#undef gzgetc +int ZEXPORT gzgetc(file) gzFile file; { int ret; @@ -402,13 +403,6 @@ int ZEXPORT gzgetc_(file) return ret < 1 ? -1 : buf[0]; } -#undef gzgetc -int ZEXPORT gzgetc(file) -gzFile file; -{ - return gzgetc_(file); -} - /* -- see zlib.h -- */ int ZEXPORT gzungetc(c, file) 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 { unsigned char *next; z_off64_t pos; }; -ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); #ifdef Z_PREFIX_SET # undef z_gzgetc # define z_gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : 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)) + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) #endif /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or