summaryrefslogtreecommitdiff
path: root/zutil.c
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-26 11:40:32 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-26 12:00:03 +0000
commitdb333af7e9b90a23fd7f9cd8dc128123b34bf698 (patch)
tree6303914d50f8a290b61a7f632ea9beaa181dd317 /zutil.c
parent34ebe95889444111f4d09cc9d2c26afa89bcf980 (diff)
parent50893291621658f355bc5b4d450a8d06a563053d (diff)
downloadzlib-db333af7e9b90a23fd7f9cd8dc128123b34bf698.tar.gz
Merge tag 'v1.2.8' into baserock/richardmaw/S10786-finer-splittingbaserock/richardmaw/S10786-finer-splitting
zlib 1.2.8
Diffstat (limited to 'zutil.c')
-rw-r--r--zutil.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/zutil.c b/zutil.c
index 898ed34..23d2ebe 100644
--- a/zutil.c
+++ b/zutil.c
@@ -1,17 +1,20 @@
/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
#include "zutil.h"
+#ifndef Z_SOLO
+# include "gzguts.h"
+#endif
#ifndef NO_DUMMY_DECL
struct internal_state {int dummy;}; /* for buggy compilers */
#endif
-const char * const z_errmsg[10] = {
+z_const char * const z_errmsg[10] = {
"need dictionary", /* Z_NEED_DICT 2 */
"stream end", /* Z_STREAM_END 1 */
"", /* Z_OK 0 */
@@ -85,27 +88,27 @@ uLong ZEXPORT zlibCompileFlags()
#ifdef FASTEST
flags += 1L << 21;
#endif
-#ifdef STDC
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifdef NO_vsnprintf
- flags += 1L << 25;
+ flags += 1L << 25;
# ifdef HAS_vsprintf_void
- flags += 1L << 26;
+ flags += 1L << 26;
# endif
# else
# ifdef HAS_vsnprintf_void
- flags += 1L << 26;
+ flags += 1L << 26;
# endif
# endif
#else
- flags += 1L << 24;
+ flags += 1L << 24;
# ifdef NO_snprintf
- flags += 1L << 25;
+ flags += 1L << 25;
# ifdef HAS_sprintf_void
- flags += 1L << 26;
+ flags += 1L << 26;
# endif
# else
# ifdef HAS_snprintf_void
- flags += 1L << 26;
+ flags += 1L << 26;
# endif
# endif
#endif
@@ -181,6 +184,7 @@ void ZLIB_INTERNAL zmemzero(dest, len)
}
#endif
+#ifndef Z_SOLO
#ifdef SYS16BIT
@@ -316,3 +320,5 @@ void ZLIB_INTERNAL zcfree (opaque, ptr)
}
#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */