Complete update of zlib from 1.2.3 to 1.2.5.

third_party/zlib/google.patch

+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
 @@ -0,0 +1,168 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
 + * The contents of this file are subject to the Mozilla Public License Version
 + * 1.1 (the "License"); you may not use this file except in compliance with
@@ skipping 165 matching lines @@
 @@ -8,6 +8,9 @@
  #ifndef ZCONF_H
  #define ZCONF_H
  
 +/* This include does prefixing as below, but with an updated set of names */
 +#include "mozzconf.h"
 +
  /*
   * 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 @@
  #endif
  
  #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
 -#  define gzopen gzopen64
 -#  define gzseek gzseek64
 -#  define gztell gztell64
 -#  define gzoffset gzoffset64
 -#  define adler32_combine adler32_combine64
 -#  define crc32_combine crc32_combine64
 +#  if !defined(MOZZCONF_H)
 +#    define gzopen gzopen64
 +#    define gzseek gzseek64
 +#    define gztell gztell64
 +#    define gzoffset gzoffset64
 +#    define adler32_combine adler32_combine64
 +#    define crc32_combine crc32_combine64
 +#  endif
  #  ifdef _LARGEFILE64_SOURCE
       ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
       ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));