Complete update of zlib from 1.2.3 to 1.2.5.
You may think that https://codereview.chromium.org/8806004 , back in
2011, did this. However, that's not correct. That update only patched files which
were present in both our old, customized checkout and zlib 1.2.5.
In zlib 1.2.5, gzio.c was replaced with gzclose.c, gzguts.h, gzlib.c, gzread.c
and gzwrite.c. We did not add those files. We just used the gzio.c from 1.2.3
with our custom patches from Gears, together with the rest of 1.2.5.
This unholy chimera worked until I went ahead and tried to fix the broken
mangling for 64 bit API symbols. See
https://codereview.chromium.org/13473020/ . This uncovered the lack of
gzread64, which was, after that fix, referenced by libxml. Since gzio.c from
1.2.3 doesn't have gzread64, this was something of a problem. I'm thus
finishing the update.
R=agl@chromium.org,rsleevi@chromium.org,brettw@chromium.org,bradchen@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/13564004
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 17f706d599cfb296c633a12bc32f7bbf5633e6d9
diff --git a/google.patch b/google.patch
index 1c59bec..e2bc2a0 100644
--- a/google.patch
+++ b/google.patch
@@ -1,3 +1,17 @@
+diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c
+--- zlib-1.2.5/gzlib.c
++++ zlib/gzlib.c
+@@ -5,7 +5,9 @@
+
+ #include "gzguts.h"
+
+-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
++#if defined(_WIN32)
++# define LSEEK _lseeki64
++#elif defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+ # define LSEEK lseek64
+ #else
+ # define LSEEK lseek
diff -ru zlib-1.2.5/mozzconf.h zlib/mozzconf.h
--- zlib-1.2.5/mozzconf.h 2011-12-15 18:10:49.000000000 +0800
+++ zlib/mozzconf.h 2011-12-16 16:08:00.000000000 +0800
@@ -183,7 +197,15 @@
/*
* If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-diff -ru zlib-1.2.5/zlib.h zlib/zlib.h
+@@ -359,7 +359,7 @@ typedef uLong FAR uLongf;
+ typedef Byte *voidp;
+ #endif
+
+-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
++#if !defined(_WIN32)
+ # define Z_HAVE_UNISTD_H
+ #endif
+
--- zlib-1.2.5/zlib.h 2010-04-20 12:12:48.000000000 +0800
+++ zlib/zlib.h 2011-12-16 16:08:48.000000000 +0800
@@ -1572,12 +1572,14 @@