From 4fe1affc6d0ef240c071e950f5127a482646c681 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Fri, 11 Feb 2022 13:49:28 +0100 Subject: [PATCH] Remove zng_gzgetc_ function from zlib-ng native API. It exists in zlib for backwards compatibility, but has never been documented/advertised for use in zlib-ngs native API. --- gzread.c.in | 2 ++ zlib-ng.h.in | 1 - zlib-ng.map | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gzread.c.in b/gzread.c.in index 3e1dc1d1..f17a5f88 100644 --- a/gzread.c.in +++ b/gzread.c.in @@ -432,9 +432,11 @@ int Z_EXPORT PREFIX(gzgetc)(gzFile file) { return gz_read(state, buf, 1) < 1 ? -1 : buf[0]; } +#ifdef ZLIB_COMPAT int Z_EXPORT PREFIX(gzgetc_)(gzFile file) { return PREFIX(gzgetc)(file); } +#endif /* -- see zlib.h -- */ int Z_EXPORT PREFIX(gzungetc)(int c, gzFile file) { diff --git a/zlib-ng.h.in b/zlib-ng.h.in index c46f776a..38a5225f 100644 --- a/zlib-ng.h.in +++ b/zlib-ng.h.in @@ -1791,7 +1791,6 @@ struct gzFile_s { unsigned char *next; z_off64_t pos; }; -Z_EXTERN Z_EXPORT int32_t zng_gzgetc_(gzFile file); /* backward compatibility */ # define @ZLIB_SYMBOL_PREFIX@zng_gzgetc(g) ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (@ZLIB_SYMBOL_PREFIX@zng_gzgetc)(g)) #endif /* WITH_GZFILEOP */ diff --git a/zlib-ng.map b/zlib-ng.map index 5ac11473..aa29a54e 100644 --- a/zlib-ng.map +++ b/zlib-ng.map @@ -93,7 +93,6 @@ ZLIB_NG_GZ_2.0.0 { zng_gzfread; zng_gzfwrite; zng_gzgetc; - zng_gzgetc_; zng_gzgets; zng_gzoffset; zng_gzoffset64; -- 2.47.3