Revert of Update Zlib to version 1.2.8

third_party/zlib/zutil.c

Index: third_party/zlib/zutil.c
diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c
index 23d2ebef008fdcc00833eba0d9abcd7b9c665531..898ed345b0e3ef23ce5aaba1eb6307b5b113d6b1 100644
--- a/third_party/zlib/zutil.c
+++ b/third_party/zlib/zutil.c
@@ -1,20 +1,17 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010 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
 
-z_const char * const z_errmsg[10] = {
+const char * const z_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
 "",                    /* Z_OK              0  */
@@ -88,27 +85,27 @@
 #ifdef FASTEST
     flags += 1L << 21;
 #endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#ifdef STDC
 #  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
@@ -184,7 +181,6 @@
 }
 #endif
 
-#ifndef Z_SOLO
 
 #ifdef SYS16BIT
 
@@ -320,5 +316,3 @@
 }
 
 #endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */