Fix mangling of zlib API on 64 bit platforms.

third_party/zlib/google.patch

Index: third_party/zlib/google.patch
diff --git a/third_party/zlib/google.patch b/third_party/zlib/google.patch
index e2bc2a06259d10e14521d6dcd2711ec11f2cc35e..9c3450de2f2c59e3fbdf8017cd2c7bd56063d73b 100644
--- a/third_party/zlib/google.patch
+++ b/third_party/zlib/google.patch
@@ -207,25 +207,34 @@ diff -ru zlib-1.2.5/zconf.h zlib/zconf.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 @@
++++ zlib/zlib.h	2013-04-06 16:08:48.000000000 +0800
+@@ -1572,11 +1572,29 @@
  #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
++#  ifdef gzopen
++#    undef gzopen
 +#  endif
+ #  define gzopen gzopen64
++#  ifdef gzseek
++#    undef gzseek
++#  endif
+ #  define gzseek gzseek64
++#  ifdef gztell
++#    undef gztell
++#  endif
+ #  define gztell gztell64
++#  ifdef gzoffset
++#    undef gzoffset
++#  endif
+ #  define gzoffset gzoffset64
++#  ifdef adler32_combine
++#    undef adler32_combine
++#  endif
+ #  define adler32_combine adler32_combine64
++#  ifdef crc32_combine
++#    undef crc32_combine
++#  endif
+ #  define crc32_combine crc32_combine64
  #  ifdef _LARGEFILE64_SOURCE
       ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));