diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 21:35:26 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 21:35:26 +0000 |
| commit | 73d00e88fde4c84c583fc9b04a0b2626f9f4b74a (patch) | |
| tree | 7221b1824b094cff27a9785f04873ae60546fdad /third_party/zlib/zutil.c | |
| parent | 21306122a9a3c3ce383029eda9138f631096559c (diff) | |
| download | chromium_src-73d00e88fde4c84c583fc9b04a0b2626f9f4b74a.zip chromium_src-73d00e88fde4c84c583fc9b04a0b2626f9f4b74a.tar.gz chromium_src-73d00e88fde4c84c583fc9b04a0b2626f9f4b74a.tar.bz2 | |
Apply Gears modifications to zlib to our copy, so we're both using the same
version.
Review URL: http://codereview.chromium.org/17358
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/zutil.c')
| -rw-r--r-- | third_party/zlib/zutil.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c index 4a51340..ca08ea6 100644 --- a/third_party/zlib/zutil.c +++ b/third_party/zlib/zutil.c @@ -141,7 +141,9 @@ const char * ZEXPORT zError(err) * errno. We define it as a global variable to simplify porting. * Its value is always 0 and should not be used. */ - int errno = 0; + // Google Gears modification: zutil.h defines errno as z_errno for WinCE. + //int errno = 0; + int z_errno = 0; #endif #ifndef HAVE_MEMCPY |