Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: third_party/zlib/mozzconf.h

Issue 2690623003: Update zlib to 1.2.11 (Closed)
Patch Set: Drop the inflater change, improve the deflater comment Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/zlib/inftrees.c ('k') | third_party/zlib/names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/mozzconf.h
diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
deleted file mode 100644
index 10aca44b29a4dadf73581b52bf8759284f5c7c5a..0000000000000000000000000000000000000000
--- a/third_party/zlib/mozzconf.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- 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,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the mozilla zlib configuration.
- *
- * The Initial Developer of the Original Code is IBM Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MOZZCONF_H
-#define MOZZCONF_H
-
-#if defined(XP_WIN) && defined(ZLIB_DLL) && !defined(MOZ_ENABLE_LIBXUL)
-#undef ZLIB_DLL
-#endif
-
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-#define ZEXTERN __attribute__((visibility ("default"))) extern
-#endif
-
-/* Exported Symbols */
-#define zlibVersion MOZ_Z_zlibVersion
-#define deflate MOZ_Z_deflate
-#define deflateEnd MOZ_Z_deflateEnd
-#define inflate MOZ_Z_inflate
-#define inflateEnd MOZ_Z_inflateEnd
-#define deflateSetDictionary MOZ_Z_deflateSetDictionary
-#define deflateCopy MOZ_Z_deflateCopy
-#define deflateReset MOZ_Z_deflateReset
-#define deflateParams MOZ_Z_deflateParams
-#define deflateBound MOZ_Z_deflateBound
-#define deflatePrime MOZ_Z_deflatePrime
-#define inflateSetDictionary MOZ_Z_inflateSetDictionary
-#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 gzvprintf MOZ_Z_gzvprintf
-#define gzputs MOZ_Z_gzputs
-#define gzgets MOZ_Z_gzgets
-#define gzputc MOZ_Z_gzputc
-#define gzgetc MOZ_Z_gzgetc
-#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_
-#define inflateBackInit_ MOZ_Z_inflateBackInit_
-#define inflateSyncPoint MOZ_Z_inflateSyncPoint
-#define get_crc_table MOZ_Z_get_crc_table
-#define zError MOZ_Z_zError
-
-/* Extra global symbols */
-#define _dist_code MOZ_Z__dist_code
-#define _length_code MOZ_Z__length_code
-#define _tr_align MOZ_Z__tr_align
-#define _tr_flush_block MOZ_Z__tr_flush_block
-#define _tr_init MOZ_Z__tr_init
-#define _tr_stored_block MOZ_Z__tr_stored_block
-#define _tr_tally MOZ_Z__tr_tally
-#define deflate_copyright MOZ_Z_deflate_copyright
-#define inflate_copyright MOZ_Z_inflate_copyright
-#define inflate_fast MOZ_Z_inflate_fast
-#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
-#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
-
-/* 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
-
-/* Chromium-specific modifications */
-#define copy_with_crc MOZ_Z__copy_with_crc
-#define crc_finalize MOZ_Z__crc_finalize
-#define crc_reset MOZ_Z__crc_reset
-// read_buf used to be local, but this was changed in simd.patch.
-#define read_buf MOZ_Z__read_buf
-#define x86_check_features MOZ_Z__x86_check_features
-
-/* Mangle Byte types except on Mac. */
-#if !defined(__MACTYPES__)
-#define Byte MOZ_Z_Byte
-#define Bytef MOZ_Z_Bytef
-#endif
-
-#endif
« no previous file with comments | « third_party/zlib/inftrees.c ('k') | third_party/zlib/names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698