Clean up the addition of gzvprintf.

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index 34b1466567f019fb3898bf8938e569b9b1903da0..a382aecd6eb924a0a40c7acc1412e4a61e034fd1 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -140,3 +140,4 @@ EXPORTS
 
 ; zlib1 v1.2.8 added:
         inflateGetDictionary                    @166
+        gzvprintf                               @167

diff --git a/contrib/vstudio/vc11/zlibvc11.def b/contrib/vstudio/vc11/zlibvc11.def
index 08e3dea4d10c56572a931ef1eb8f2f39ed068c8d..49c1aa3c76050cbb8c3732dfa4ba90094d7aca8b 100644 (file)
--- a/contrib/vstudio/vc11/zlibvc11.def
+++ b/contrib/vstudio/vc11/zlibvc11.def
@@ -140,3 +140,4 @@ EXPORTS
 
 ; zlib1 v1.2.8 added:
         inflateGetDictionary                    @166
+        gzvprintf                               @167

diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index 08e3dea4d10c56572a931ef1eb8f2f39ed068c8d..49c1aa3c76050cbb8c3732dfa4ba90094d7aca8b 100644 (file)
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -140,3 +140,4 @@ EXPORTS
 
 ; zlib1 v1.2.8 added:
         inflateGetDictionary                    @166
+        gzvprintf                               @167

diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 3af7061f7fb8d903503ab78f6aed9da66499d499..9dc6aadfd379a503911d100b3e935f79b5923628 100644 (file)
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -140,3 +140,4 @@ EXPORTS
 
 ; zlib1 v1.2.8 added:
         inflateGetDictionary                    @166
+        gzvprintf                               @167

diff --git a/win32/zlib.def b/win32/zlib.def
index f10fa7a67f922603deb86e4d5041cd8838cc26f2..face655183a63bd30e4c226272bc0273119f1611 100644 (file)
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -40,6 +40,7 @@ EXPORTS
     gzread
     gzwrite
     gzprintf
+    gzvprintf
     gzputs
     gzgets
     gzputc

diff --git a/zconf.h b/zconf.h
index c6ec884d10c226f923ab1830d5acd69bcf7d5997..371f755b67c1f49bc96996b9057cd668eb776173 100644 (file)
--- a/zconf.h
+++ b/zconf.h
@@ -78,6 +78,7 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread

diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 9254e9a25351fcdff96a57d06887ee778e370c7f..ae8799efaf3f9d621265f0f04c7b5d48ae954b98 100644 (file)
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -80,6 +80,7 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread

diff --git a/zconf.h.in b/zconf.h.in
index c6ec884d10c226f923ab1830d5acd69bcf7d5997..371f755b67c1f49bc96996b9057cd668eb776173 100644 (file)
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -78,6 +78,7 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread

diff --git a/zlib.h b/zlib.h
index 7ae67a1e532fc29d862bf4d4c23511bade206491..65eb6250e4bdf65676f4c2082ce219047cc8bea5 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -1755,8 +1755,9 @@ ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
-ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, const char *format,
-                                       va_list va));
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
 #  endif
 #endif
 

diff --git a/zlib.map b/zlib.map
index 9704371551791757019a38d86bcd16b1ac218dff..55c6647eb46f95a82af2881d4943d0457058480a 100644 (file)
--- a/zlib.map
+++ b/zlib.map
@@ -79,4 +79,5 @@ ZLIB_1.2.5.2 {
 
 ZLIB_1.2.7.1 {
     inflateGetDictionary;
-} ZLIB_1.2.7;
+    gzvprintf;
+} ZLIB_1.2.5.2;