Include "mozzconf.h".

This change includes "mozzconf.h" in our copy of 'zconf.h' as we did before updating to zlib 1.2.5 to avoid symbol conflicts with sdch happening when we use supalink.

BUG=none
TEST=link Chromium with supalink.

Review URL: http://codereview.chromium.org/8933001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114194 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 53 insertions, 5 deletions

diff --git a/third_party/zlib/README.chromium b/third_party/zlib/README.chromium
index 9eb1961..dbfd06a 100644
--- a/third_party/zlib/README.chromium
+++ b/third_party/zlib/README.chromium
@@ -11,3 +11,4 @@ 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.
+- Added 'mozzconf.h' to mangle the function names.
diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
index 118185c..9f6f56f 100644
--- a/third_party/zlib/mozzconf.h
+++ b/third_party/zlib/mozzconf.h
@@ -68,7 +68,6 @@
 #define compress2 MOZ_Z_compress2
 #define compressBound MOZ_Z_compressBound
 #define uncompress MOZ_Z_uncompress
-#define gzopen MOZ_Z_gzopen
 #define gzdopen MOZ_Z_gzdopen
 #define gzsetparams MOZ_Z_gzsetparams
 #define gzread MOZ_Z_gzread
@@ -80,9 +79,7 @@
 #define gzgetc MOZ_Z_gzgetc
 #define gzungetc MOZ_Z_gzungetc
 #define gzflush MOZ_Z_gzflush
-#define gzseek MOZ_Z_gzseek
 #define gzrewind MOZ_Z_gzrewind
-#define gztell MOZ_Z_gztell
 #define gzeof MOZ_Z_gzeof
 #define gzclose MOZ_Z_gzclose
 #define gzerror MOZ_Z_gzerror
@@ -119,12 +116,59 @@
 #define out_func MOZ_Z_out_func
 
 /* New as of libpng-1.2.3 */
-#define adler32_combine MOZ_Z_adler32_combine
-#define crc32_combine MOZ_Z_crc32_combine
 #define deflateSetHeader MOZ_Z_deflateSetHeader
 #define deflateTune MOZ_Z_deflateTune
 #define gzdirect MOZ_Z_gzdirect
 #define inflatePrime MOZ_Z_inflatePrime
 #define inflateGetHeader MOZ_Z_inflateGetHeader
 
+/* New as of zlib 1.2.5 */
+#define gz_error MOZ_Z_gz_error
+#define gz_intmax MOZ_Z_gz_intmax
+#define gz_strwinerror MOZ_Z_gz_strwinerror
+#define gzbuffer MOZ_Z_gzbuffer
+#define gzclose_r MOZ_Z_gzclose_r
+#define gzclose_w MOZ_Z_gzclose_w
+#define inflateMark MOZ_Z_inflateMark
+#define inflateReset2 MOZ_Z_inflateReset2
+#define inflateUndermine MOZ_Z_inflateUndermine
+#define charf MOZ_Z_charf
+#define gzFile MOZ_Z_gzFile
+#define gz_header MOZ_Z_gz_header
+#define gz_headerp MOZ_Z_gz_headerp
+#define intf MOZ_Z_intf
+#define uInt MOZ_Z_uInt
+#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
+
+/* Mangle Byte types except on Mac. */
+#if !defined(__MACTYPES__)
+#define Byte MOZ_Z_Byte
+#define Bytef MOZ_Z_Bytef
+#endif
+
+/* Mangle only 64-bit functions on platforms which support 64-bit files to avoid
+ * conflicts with manglings in zlib.h. */
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+#define gzopen64 MOZ_Z_gzopen64
+#define gzseek64 MOZ_Z_gzseek64
+#define gztell64 MOZ_Z_gztell64
+#define gzoffset64 MOZ_Z_gzoffset64
+#define adler32_combine64 MOZ_Z_adler32_combine64
+#define crc32_combine64 MOZ_Z_crc32_combine64
+#else
+#define gzopen MOZ_Z_gzopen
+#define gzseek MOZ_Z_gzseek
+#define gztell MOZ_Z_gztell
+#define gzoffset MOZ_Z_gzoffset
+#define adler32_combine MOZ_Z_adler32_combine
+#define crc32_combine MOZ_Z_crc32_combine
+#endif
+
 #endif
diff --git a/third_party/zlib/zconf.h b/third_party/zlib/zconf.h
index 02ce56c..b88ec7d 100644
--- a/third_party/zlib/zconf.h
+++ b/third_party/zlib/zconf.h
@@ -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.