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. --- gzwrite.c | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gzwrite.c') diff --git a/gzwrite.c b/gzwrite.c index caa35b6..3b24b84 100644 --- 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; -} -- cgit v1.2.3-55-g6feb