From 55b8b5fec16503cb9ce26074f600a1d7b426a0cc Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Wed, 1 Feb 2012 23:25:34 -0800 Subject: Put gzflags() functionality back in zutil.c. gzflags() was put in gzwrite.c in order to be compiled exactly the same as gzprintf(), so that it was guaranteed to return the correct information. However that causes a static linkage to zlib to bring in many routines that are often not used. All that is required to duplicate the compilation environment of gzprintf() is to include gzguts.h. So that is now done in zutil.c to assure that the correct flags are returned. --- contrib/vstudio/vc10/zlibvc.def | 1 - contrib/vstudio/vc9/zlibvc.def | 1 - 2 files changed, 2 deletions(-) (limited to 'contrib') diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index 571b0a6..b4bb8f6 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def @@ -132,6 +132,5 @@ EXPORTS ; zlib1 v1.2.6 added: gzgetc_ @161 - gzflags @162 inflateResetKeep @163 deflateResetKeep @164 diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index 571b0a6..b4bb8f6 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def @@ -132,6 +132,5 @@ EXPORTS ; zlib1 v1.2.6 added: gzgetc_ @161 - gzflags @162 inflateResetKeep @163 deflateResetKeep @164 -- cgit v1.2.3-55-g6feb