aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-10-02 11:15:00 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-10-02 11:15:00 -0700
commit00c836e325a07419f5d855e2f275500a37cb27d2 (patch)
tree1b4ef187059c19ee142f6c61952133b50a295136 /contrib
parent0956bd23dd070074ec572fd5557a74ff29797b2f (diff)
downloadzlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.gz
zlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.bz2
zlib-00c836e325a07419f5d855e2f275500a37cb27d2.zip
Merge vestigial vsnprintf determination from zutil.h to gzguts.h.
This also moves some of the same from zconf.h to gzguts.h. A new function, gzflags(), was created to pass the compilation flags related to vsnprintf usage back to zlibCompileFlags() in zutil.c. In the process, various compiler configuration files were updated to include gzflags(), as well as the new gzgetc_() function added when the gzgetc() macro was introduced in a previous patch.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/vstudio/vc10/zlibvc.def5
-rw-r--r--contrib/vstudio/vc9/zlibvc.def5
2 files changed, 8 insertions, 2 deletions
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index ad8b4af..0d6dc38 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -33,7 +33,6 @@ EXPORTS
33 zlibVersion @27 33 zlibVersion @27
34 gzprintf @28 34 gzprintf @28
35 gzputc @29 35 gzputc @29
36 gzgetc @30
37 gzseek @31 36 gzseek @31
38 gzrewind @32 37 gzrewind @32
39 gztell @33 38 gztell @33
@@ -129,3 +128,7 @@ EXPORTS
129 inflatePrime @158 128 inflatePrime @158
130 inflateReset2 @159 129 inflateReset2 @159
131 inflateUndermine @160 130 inflateUndermine @160
131
132; zlib1 v1.2.6 added:
133 gzgetc_ @30
134 gzflags @162
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index ad8b4af..0d6dc38 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -33,7 +33,6 @@ EXPORTS
33 zlibVersion @27 33 zlibVersion @27
34 gzprintf @28 34 gzprintf @28
35 gzputc @29 35 gzputc @29
36 gzgetc @30
37 gzseek @31 36 gzseek @31
38 gzrewind @32 37 gzrewind @32
39 gztell @33 38 gztell @33
@@ -129,3 +128,7 @@ EXPORTS
129 inflatePrime @158 128 inflatePrime @158
130 inflateReset2 @159 129 inflateReset2 @159
131 inflateUndermine @160 130 inflateUndermine @160
131
132; zlib1 v1.2.6 added:
133 gzgetc_ @30
134 gzflags @162