[zlib] Fix unmangled symbols.

third_party/zlib/google.patch

 diff --git a/third_party/zlib/contrib/minizip/ioapi.h b/third_party/zlib/contrib/minizip/ioapi.h
 index 8dcbdb0..c1b7a54 100644
 --- a/third_party/zlib/contrib/minizip/ioapi.h
 +++ b/third_party/zlib/contrib/minizip/ioapi.h
 @@ -43,7 +43,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
 -#include "zlib.h"
 +#include "third_party/zlib/zlib.h"
@@ skipping 104 matching lines @@
  #endif
 +
  int ZEXPORT gzgetc(file)
      gzFile file;
  {
 diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
 new file mode 100644
 index 0000000..80994c9
 --- /dev/null
 +++ b/third_party/zlib/mozzconf.h
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,178 @@
 +/* -*- 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
 + * the License. You may obtain a copy of the License at
 + * http://www.mozilla.org/MPL/
 + *
 + * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 144 matching lines @@
 +#define uIntf MOZ_Z_uIntf
 +#define uLong MOZ_Z_uLong
 +#define uLongf MOZ_Z_uLongf
 +#define voidp MOZ_Z_voidp
 +#define voidpc MOZ_Z_voidpc
 +#define voidpf MOZ_Z_voidpf
 +#define gz_header_s MOZ_Z_gz_header_s
 +#define internal_state MOZ_Z_internal_state
 +
 +/* New as of zlib 1.2.8 */
++#define _tr_flush_bits MOZ_Z__tr_flush_bits
 +#define deflateResetKeep MOZ_Z_deflateResetKeep
 +#define deflatePending MOZ_Z_deflatePending
 +#define inflateGetDictionary MOZ_Z_inflateGetDictionary
 +#define inflateResetKeep MOZ_Z_inflateResetKeep
 +#define gzopen_w MOZ_Z_gzopen_w
 +
 +/* Mangle Byte types except on Mac. */
 +#if !defined(__MACTYPES__)
 +#define Byte MOZ_Z_Byte
 +#define Bytef MOZ_Z_Bytef
@@ skipping 108 matching lines @@
 +#else
 +#define zalign(x) __attribute__((aligned((x))))
 +#endif
 +
  #ifdef WIN32
  #  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
  #    define OS_CODE  0x0b
 -- 
 2.7.4