Clean up the addition of gzvprintf.

12 years ago · 0aac8cf7c4
parent f0546c8e34
commit 0aac8cf7c4
10 changed files with 13 additions and 3 deletions
--- 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
--- 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
--- 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
--- 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
--- a/win32/zlib.def
+++ b/win32/zlib.def
@ -40,6 +40,7 @@ EXPORTS
    gzread
    gzwrite
    gzprintf
+    gzvprintf
    gzputs
    gzgets
    gzputc
--- 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
--- 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
--- 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
--- 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

--- 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;