diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 17:15:13 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 17:15:13 +0000 |
| commit | 17f706d599cfb296c633a12bc32f7bbf5633e6d9 (patch) | |
| tree | 37394c0f061f4cc884387c1210105dfd9f00df5d /third_party/zlib/zconf.h | |
| parent | 5f9174ec7fad90e760ca940453c0e848f1974a2d (diff) | |
| download | chromium_src-17f706d599cfb296c633a12bc32f7bbf5633e6d9.zip chromium_src-17f706d599cfb296c633a12bc32f7bbf5633e6d9.tar.gz chromium_src-17f706d599cfb296c633a12bc32f7bbf5633e6d9.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/zconf.h')
| -rw-r--r-- | third_party/zlib/zconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/zlib/zconf.h b/third_party/zlib/zconf.h index b88ec7d..73662d8 100644 --- a/third_party/zlib/zconf.h +++ b/third_party/zlib/zconf.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 |