From 73d00e88fde4c84c583fc9b04a0b2626f9f4b74a Mon Sep 17 00:00:00 2001 From: "mpcomplete@google.com" Date: Tue, 13 Jan 2009 21:35:26 +0000 Subject: 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 --- third_party/zlib/zutil.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'third_party/zlib/zutil.c') 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 -- cgit v1.1