Fix mangled function names.

third_party/zlib/mozzconf.h

 /* -*- 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 50 matching lines @@
 #define inflateSync MOZ_Z_inflateSync
 #define inflateCopy MOZ_Z_inflateCopy
 #define inflateReset MOZ_Z_inflateReset
 #define inflateBack MOZ_Z_inflateBack
 #define inflateBackEnd MOZ_Z_inflateBackEnd
 #define zlibCompileFlags MOZ_Z_zlibCompileFlags
 #define compress MOZ_Z_compress
 #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
 #define gzwrite MOZ_Z_gzwrite
 #define gzprintf MOZ_Z_gzprintf
 #define gzputs MOZ_Z_gzputs
 #define gzgets MOZ_Z_gzgets
 #define gzputc MOZ_Z_gzputc
 #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
 #define gzclearerr MOZ_Z_gzclearerr
 #define adler32 MOZ_Z_adler32
 #define crc32 MOZ_Z_crc32
 #define deflateInit_ MOZ_Z_deflateInit_
 #define deflateInit2_ MOZ_Z_deflateInit2_
 #define inflateInit_ MOZ_Z_inflateInit_
 #define inflateInit2_ MOZ_Z_inflateInit2_
@@ skipping 16 matching lines @@
 #define inflate_table MOZ_Z_inflate_table
 #define z_errmsg MOZ_Z_z_errmsg
 #define zcalloc MOZ_Z_zcalloc
 #define zcfree MOZ_Z_zcfree
 #define alloc_func MOZ_Z_alloc_func
 #define free_func MOZ_Z_free_func
 #define in_func MOZ_Z_in_func
 #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 gzoffset MOZ_Z_gzoffset
+#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
 #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
@@ skipping 10 matching lines @@
 #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