From 0aac8cf7c4da2572609d177657fb5f947bf38cd2 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sat, 23 Mar 2013 23:47:15 -0700 Subject: [PATCH] Clean up the addition of gzvprintf. --- contrib/vstudio/vc10/zlibvc.def | 1 + contrib/vstudio/vc11/zlibvc11.def | 1 + contrib/vstudio/vc12/zlibvc.def | 1 + contrib/vstudio/vc9/zlibvc.def | 1 + win32/zlib.def | 1 + zconf.h | 1 + zconf.h.cmakein | 1 + zconf.h.in | 1 + zlib.h | 5 +++-- zlib.map | 3 ++- 10 files changed, 13 insertions(+), 3 deletions(-) diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index 34b14665..a382aecd 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 08e3dea4..49c1aa3c 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 08e3dea4..49c1aa3c 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 3af7061f..9dc6aadf 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 f10fa7a6..face6551 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 c6ec884d..371f755b 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 9254e9a2..ae8799ef 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 c6ec884d..371f755b 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 7ae67a1e..65eb6250 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 97043715..55c6647e 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;