From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 24 Mar 2013 06:47:15 +0000 (-0700)
Subject: Clean up the addition of gzvprintf.
X-Git-Tag: v1.2.7.1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aac8cf7c4da2572609d177657fb5f947bf38cd2;p=thirdparty%2Fzlib-ng.git

Clean up the addition of gzvprintf.
---

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index 34b146656..a382aecd6 100644
--- 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 08e3dea4d..49c1aa3c7 100644
--- 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 08e3dea4d..49c1aa3c7 100644
--- 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 3af7061f7..9dc6aadfd 100644
--- 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 f10fa7a67..face65518 100644
--- 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 c6ec884d1..371f755b6 100644
--- 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 9254e9a25..ae8799efa 100644
--- 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 c6ec884d1..371f755b6 100644
--- 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 7ae67a1e5..65eb6250e 100644
--- 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 970437155..55c6647eb 100644
--- 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;