From 00c836e325a07419f5d855e2f275500a37cb27d2 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 2 Oct 2011 11:15:00 -0700 Subject: 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. --- contrib/vstudio/vc10/zlibvc.def | 5 ++++- contrib/vstudio/vc9/zlibvc.def | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib') 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 zlibVersion @27 gzprintf @28 gzputc @29 - gzgetc @30 gzseek @31 gzrewind @32 gztell @33 @@ -129,3 +128,7 @@ EXPORTS inflatePrime @158 inflateReset2 @159 inflateUndermine @160 + +; zlib1 v1.2.6 added: + gzgetc_ @30 + 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 zlibVersion @27 gzprintf @28 gzputc @29 - gzgetc @30 gzseek @31 gzrewind @32 gztell @33 @@ -129,3 +128,7 @@ EXPORTS inflatePrime @158 inflateReset2 @159 inflateUndermine @160 + +; zlib1 v1.2.6 added: + gzgetc_ @30 + gzflags @162 -- cgit v1.2.3-55-g6feb