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

3 files changed, 24 insertions, 17 deletions

diff --git a/third_party/zlib/README.google b/third_party/zlib/README.google
index 0dffcd3..5d7a0970 100644
--- a/third_party/zlib/README.google
+++ b/third_party/zlib/README.google
@@ -1,15 +1,13 @@
-This library was downloaded from http://www.zlib.net/zlib-1.2.3.zip

-

-Licensing information appears at the top of each source file.

-

-ZLIB is a compression library compatible with the gzip format. 

-It has been written by Jean-Loup Gailly and Mark Adler. It is free software.

-

-The minizip contrib package enables extracting files from a .zip archive file.

-

-This directory contains a subset of the source package, just the main source 

-and a single contrib package, minizip.

-

-Version: 1.2.3

-

-Learn more at http://www.zlib.net/

+URL:  http://zlib.net/
+Version: 1.2.3
+License: zlib
+License File: LICENSE
+
+Description:
+General purpose compression library
+
+Local Modifications:
+A few minor changes, all marked with "Google":
+- Added #ifdefs to avoid compile warnings when NO_GZCOMPRESS is defined.
+- Removed use of strerror for WinCE in gzio.c.
+- Added 'int z_errno' global for WinCE, to which 'errno' is defined in zutil.h.
\ No newline at end of file
diff --git a/third_party/zlib/gzio.c b/third_party/zlib/gzio.c
index 2c0c1d7..b5f052c 100644
--- a/third_party/zlib/gzio.c
+++ b/third_party/zlib/gzio.c
@@ -74,11 +74,15 @@ typedef struct gz_stream {
 
 
 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 @@ int ZEXPORT gzdirect (file)
     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 @@ local void putLong (file, x)
         x >>= 8;
     }
 }
+#endif
 
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets z_err in case
@@ -971,7 +977,8 @@ int ZEXPORT gzclose (file)
     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) ""
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