Fix wrong names and invalid entries in zlib.map and zlib-ng.map

diff --git a/zlib-ng.map b/zlib-ng.map
index aa29a54ef67d419f4b4f93854cc0506c354a63c8..64411ab105e3581499b43e928dc42eac8c7b3bfd 100644 (file)
--- a/zlib-ng.map
+++ b/zlib-ng.map
@@ -5,12 +5,12 @@ ZLIB_NG_2.1.0 {
     zng_inflateBackInit;
     zng_inflateInit;
     zng_inflateInit2;
+    zlibng_version;
 };
 
 ZLIB_NG_2.0.0 {
   global:
     zng_adler32;
-    zng_adler32_c;
     zng_adler32_combine;
     zng_adler32_z;
     zng_compress;
@@ -64,17 +64,14 @@ ZLIB_NG_2.0.0 {
     zng_uncompress2;
     zng_zError;
     zng_zlibCompileFlags;
-    zng_zlibng_string;
-    zng_version;
+    zng_vstring;
   local:
     zng_deflate_copyright;
     zng_inflate_copyright;
-    zng_inflate_fast;
-    zng_inflate_table;
     zng_zcalloc;
     zng_zcfree;
     zng_z_errmsg;
-    zng_gz_error;
+    gz_error;
     _*;
 };
 
@@ -95,20 +92,20 @@ ZLIB_NG_GZ_2.0.0 {
     zng_gzgetc;
     zng_gzgets;
     zng_gzoffset;
-    zng_gzoffset64;
     zng_gzopen;
-    zng_gzopen64;
     zng_gzprintf;
     zng_gzputc;
     zng_gzputs;
     zng_gzread;
     zng_gzrewind;
     zng_gzseek;
-    zng_gzseek64;
     zng_gzsetparams;
     zng_gztell;
-    zng_gztell64;
     zng_gzungetc;
     zng_gzvprintf;
     zng_gzwrite;
 };
+
+FAIL {
+  local: *;
+};

diff --git a/zlib.map b/zlib.map
index fccc0e129db22868a4234ca140288ca8a1fa7b86..ebca10d351ed0bd6363bcbaa7c02f567f83cbcaa 100644 (file)
--- a/zlib.map
+++ b/zlib.map
@@ -9,8 +9,6 @@ ZLIB_1.2.0 {
   local:
     deflate_copyright;
     inflate_copyright;
-    inflate_fast;
-    inflate_table;
     zcalloc;
     zcfree;
     z_errmsg;

diff --git a/zutil.c b/zutil.c
index 5432b9c0033339f7cdbf4977c6dbb8da29dc9231..742c33ac3d9bd21a00d676457ddb29145b36efac 100644 (file)
--- a/zutil.c
+++ b/zutil.c
@@ -20,14 +20,14 @@ z_const char * const PREFIX(z_errmsg)[10] = {
     (z_const char *)""
 };
 
+const char PREFIX3(vstring)[] =
+    " zlib-ng 2.1.0.devel forked from zlib";
+
 #ifdef ZLIB_COMPAT
 const char * Z_EXPORT zlibVersion(void) {
     return ZLIB_VERSION;
 }
 #else
-const char zlibng_string[] =
-    " zlib-ng 2.1.0.devel forked from zlib";
-
 const char * Z_EXPORT zlibng_version(void) {
     return ZLIBNG_VERSION;
 }