Index: third_party/zlib/zutil.c |
diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c |
index 898ed345b0e3ef23ce5aaba1eb6307b5b113d6b1..23d2ebef008fdcc00833eba0d9abcd7b9c665531 100644 |
--- a/third_party/zlib/zutil.c |
+++ b/third_party/zlib/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 */ |