Apply Gears modifications to zlib to our copy, so we're both using the same
version.
Review URL: http://codereview.chromium.org/17358
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 73d00e88fde4c84c583fc9b04a0b2626f9f4b74a
diff --git a/gzio.c b/gzio.c
index 2c0c1d7..b5f052c 100644
--- a/gzio.c
+++ b/gzio.c
@@ -74,11 +74,15 @@
local gzFile gz_open OF((const char *path, const char *mode, int fd));
+#ifndef NO_GZCOMPRESS // Google Gears addition, to avoid compile warning
local int do_flush OF((gzFile file, int flush));
+#endif
local int get_byte OF((gz_stream *s));
local void check_header OF((gz_stream *s));
local int destroy OF((gz_stream *s));
+#ifndef NO_GZCOMPRESS // Google Gears addition, to avoid compile warning
local void putLong OF((FILE *file, uLong x));
+#endif
local uLong getLong OF((gz_stream *s));
/* ===========================================================================
@@ -914,6 +918,7 @@
return s->transparent;
}
+#ifndef NO_GZCOMPRESS // Google Gears addition, to avoid compile warning
/* ===========================================================================
Outputs a long in LSB order to the given file
*/
@@ -927,6 +932,7 @@
x >>= 8;
}
}
+#endif
/* ===========================================================================
Reads a long in LSB order from the given gz_stream. Sets z_err in case
@@ -971,7 +977,8 @@
return destroy((gz_stream*)file);
}
-#ifdef STDC
+// Google Gears modification: strerror is not present on WinCE.
+#if defined(STDC) && !defined(_WIN32_WCE)
# define zstrerror(errnum) strerror(errnum)
#else
# define zstrerror(errnum) ""