aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-02-01 23:25:34 -0800
committerMark Adler <madler@alumni.caltech.edu>2012-02-01 23:25:34 -0800
commit55b8b5fec16503cb9ce26074f600a1d7b426a0cc (patch)
tree7e14662a33ffd8141e9a794329aa0a731250f486 /contrib
parenta8d23bb675e05cfc0cc70ddc8ea03dbbf0e49fb8 (diff)
downloadzlib-55b8b5fec16503cb9ce26074f600a1d7b426a0cc.tar.gz
zlib-55b8b5fec16503cb9ce26074f600a1d7b426a0cc.tar.bz2
zlib-55b8b5fec16503cb9ce26074f600a1d7b426a0cc.zip
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.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/vstudio/vc10/zlibvc.def1
-rw-r--r--contrib/vstudio/vc9/zlibvc.def1
2 files changed, 0 insertions, 2 deletions
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
132 132
133; zlib1 v1.2.6 added: 133; zlib1 v1.2.6 added:
134 gzgetc_ @161 134 gzgetc_ @161
135 gzflags @162
136 inflateResetKeep @163 135 inflateResetKeep @163
137 deflateResetKeep @164 136 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
132 132
133; zlib1 v1.2.6 added: 133; zlib1 v1.2.6 added:
134 gzgetc_ @161 134 gzgetc_ @161
135 gzflags @162
136 inflateResetKeep @163 135 inflateResetKeep @163
137 deflateResetKeep @164 136 deflateResetKeep @164