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.

diff --git a/as400/bndsrc b/as400/bndsrc
index d048dbb71fa64e5a49e8e591cdff9f9e5dcb5a41..52cc6613b30a939fadc73d9dd377b7f5e12a00b2 100644 (file)
--- a/as400/bndsrc
+++ b/as400/bndsrc
@@ -195,7 +195,6 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
 /********************************************************************/
 
   EXPORT SYMBOL("gzgetc_")
-  EXPORT SYMBOL("gzflags")
 
 /********************************************************************/
 /*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */

diff --git a/as400/zlib.inc b/as400/zlib.inc
index a5838cb1dde643222c66793ffeb1acc733077997..2671c87df155031d63cd1292e0a22dfd4c179582 100644 (file)
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@@ -442,6 +442,4 @@
      D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
      D  strm                               like(z_stream)                       Expansion stream
       *
-     D gzflags         PR            10U 0 extproc('gzflags')
-      *
       /endif

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index 571b0a6687a1595f4ae17aa8b2c5c52f346805d8..b4bb8f615cdd76eb935cbdfd04987006a411da0b 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -132,6 +132,5 @@ EXPORTS
 \r
 ; zlib1 v1.2.6 added:\r
         gzgetc_                                 @161\r
-        gzflags                                 @162\r
         inflateResetKeep                        @163\r
        deflateResetKeep                        @164

diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 571b0a6687a1595f4ae17aa8b2c5c52f346805d8..b4bb8f615cdd76eb935cbdfd04987006a411da0b 100644 (file)
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -132,6 +132,5 @@ EXPORTS
 \r
 ; zlib1 v1.2.6 added:\r
         gzgetc_                                 @161\r
-        gzflags                                 @162\r
         inflateResetKeep                        @163\r
        deflateResetKeep                        @164

diff --git a/gzwrite.c b/gzwrite.c
index caa35b61ad9d834fe5a7a0b66cc23b4a5f4e386a..3b24b84a44f9947f954e1010ca485e7c0b22e7c3 100644 (file)
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -560,34 +560,3 @@ int ZEXPORT gzclose_w(file)
     free(state);
     return ret;
 }
-
-/* used by zlibVersion() to get the vsnprintf story from the horse's mouth */
-unsigned long ZEXPORT gzflags()
-{
-    unsigned long flags = 0;
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifdef NO_vsnprintf
-    flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#else
-    flags += 1L << 24;
-#  ifdef NO_snprintf
-    flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}

diff --git a/win32/zlib.def b/win32/zlib.def
index d96c18ae45d681fdb7e0be8183c117b12290ae5d..a2a2081c3f5fe43ddd9fb75b3d6780ae86d7fd11 100644 (file)
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -81,4 +81,3 @@ EXPORTS
     inflateResetKeep
     deflateResetKeep
     gzgetc_
-    gzflags

diff --git a/zconf.h b/zconf.h
index 71adb180f715d00eee0bd34f41e51200c75f93c5..7c7e7982d0b03440f000acf8568fa03ca2649b9f 100644 (file)
--- a/zconf.h
+++ b/zconf.h
@@ -65,7 +65,6 @@
 #    define gzdopen               z_gzdopen
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
-#    define gzflags               z_gzflags
 #    define gzflush               z_gzflush
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_

diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 325f93cb06cc6d3969b5e3148d6c85378082dfac..c299fb16b878228dec896dddf80942dd01447c59 100644 (file)
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -67,7 +67,6 @@
 #    define gzdopen               z_gzdopen
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
-#    define gzflags               z_gzflags
 #    define gzflush               z_gzflush
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_

diff --git a/zconf.h.in b/zconf.h.in
index 71adb180f715d00eee0bd34f41e51200c75f93c5..7c7e7982d0b03440f000acf8568fa03ca2649b9f 100644 (file)
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -65,7 +65,6 @@
 #    define gzdopen               z_gzdopen
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
-#    define gzflags               z_gzflags
 #    define gzflush               z_gzflush
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_

diff --git a/zlib.h b/zlib.h
index 72252b53fb108b27f588039202c6d78c1f67e06b..bab908a0b84aca920d732064d082d1d9e7604952 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -1727,9 +1727,6 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#ifndef Z_SOLO
-  ZEXTERN unsigned long  ZEXPORT gzflags          OF((void));
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/zlib.map b/zlib.map
index 54fa5538a53a39316cd1b565ea5c1e1980587b34..771f420412e2162ac6c9c9aefc1c3d4b15a713f5 100644 (file)
--- a/zlib.map
+++ b/zlib.map
@@ -73,7 +73,6 @@ ZLIB_1.2.5.1 {
 
 ZLIB_1.2.5.2 {
     deflateResetKeep;
-    gzflags;
     gzgetc_;
     inflateResetKeep;
 } ZLIB_1.2.5.1;

diff --git a/zutil.c b/zutil.c
index 8a1d2420937f91bdb9fe82f3fccef7d7263aa9a6..12517b40fbe1cf488a30d5be85f96211fba50fff 100644 (file)
--- a/zutil.c
+++ b/zutil.c
@@ -6,6 +6,9 @@
 /* @(#) $Id$ */
 
 #include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
 
 #ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
@@ -85,11 +88,31 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef FASTEST
     flags += 1L << 21;
 #endif
-#ifdef Z_SOLO
-    return flags;
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
 #else
-    return flags + gzflags();
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
 #endif
+    return flags;
 }
 
 #ifdef DEBUG