| OLD | NEW |
|---|
| (Empty) |
| 1 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | |
| 2 /* ***** BEGIN LICENSE BLOCK ***** | |
| 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | |
| 4 * | |
| 5 * The contents of this file are subject to the Mozilla Public License Version | |
| 6 * 1.1 (the "License"); you may not use this file except in compliance with | |
| 7 * the License. You may obtain a copy of the License at | |
| 8 * http://www.mozilla.org/MPL/ | |
| 9 * | |
| 10 * Software distributed under the License is distributed on an "AS IS" basis, | |
| 11 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | |
| 12 * for the specific language governing rights and limitations under the | |
| 13 * License. | |
| 14 * | |
| 15 * The Original Code is the mozilla zlib configuration. | |
| 16 * | |
| 17 * The Initial Developer of the Original Code is IBM Corporation. | |
| 18 * Portions created by the Initial Developer are Copyright (C) 2004 | |
| 19 * the Initial Developer. All Rights Reserved. | |
| 20 * | |
| 21 * Contributor(s): | |
| 22 * | |
| 23 * Alternatively, the contents of this file may be used under the terms of | |
| 24 * either of the GNU General Public License Version 2 or later (the "GPL"), | |
| 25 * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | |
| 26 * in which case the provisions of the GPL or the LGPL are applicable instead | |
| 27 * of those above. If you wish to allow use of your version of this file only | |
| 28 * under the terms of either the GPL or the LGPL, and not to allow others to | |
| 29 * use your version of this file under the terms of the MPL, indicate your | |
| 30 * decision by deleting the provisions above and replace them with the notice | |
| 31 * and other provisions required by the GPL or the LGPL. If you do not delete | |
| 32 * the provisions above, a recipient may use your version of this file under | |
| 33 * the terms of any one of the MPL, the GPL or the LGPL. | |
| 34 * | |
| 35 * ***** END LICENSE BLOCK ***** */ | |
| 36 | |
| 37 #ifndef MOZZCONF_H | |
| 38 #define MOZZCONF_H | |
| 39 | |
| 40 #if defined(XP_WIN) && defined(ZLIB_DLL) && !defined(MOZ_ENABLE_LIBXUL) | |
| 41 #undef ZLIB_DLL | |
| 42 #endif | |
| 43 | |
| 44 #ifdef HAVE_VISIBILITY_ATTRIBUTE | |
| 45 #define ZEXTERN __attribute__((visibility ("default"))) extern | |
| 46 #endif | |
| 47 | |
| 48 /* Exported Symbols */ | |
| 49 #define zlibVersion MOZ_Z_zlibVersion | |
| 50 #define deflate MOZ_Z_deflate | |
| 51 #define deflateEnd MOZ_Z_deflateEnd | |
| 52 #define inflate MOZ_Z_inflate | |
| 53 #define inflateEnd MOZ_Z_inflateEnd | |
| 54 #define deflateSetDictionary MOZ_Z_deflateSetDictionary | |
| 55 #define deflateCopy MOZ_Z_deflateCopy | |
| 56 #define deflateReset MOZ_Z_deflateReset | |
| 57 #define deflateParams MOZ_Z_deflateParams | |
| 58 #define deflateBound MOZ_Z_deflateBound | |
| 59 #define deflatePrime MOZ_Z_deflatePrime | |
| 60 #define inflateSetDictionary MOZ_Z_inflateSetDictionary | |
| 61 #define inflateSync MOZ_Z_inflateSync | |
| 62 #define inflateCopy MOZ_Z_inflateCopy | |
| 63 #define inflateReset MOZ_Z_inflateReset | |
| 64 #define inflateBack MOZ_Z_inflateBack | |
| 65 #define inflateBackEnd MOZ_Z_inflateBackEnd | |
| 66 #define zlibCompileFlags MOZ_Z_zlibCompileFlags | |
| 67 #define compress MOZ_Z_compress | |
| 68 #define compress2 MOZ_Z_compress2 | |
| 69 #define compressBound MOZ_Z_compressBound | |
| 70 #define uncompress MOZ_Z_uncompress | |
| 71 #define gzopen MOZ_Z_gzopen | |
| 72 #define gzdopen MOZ_Z_gzdopen | |
| 73 #define gzsetparams MOZ_Z_gzsetparams | |
| 74 #define gzread MOZ_Z_gzread | |
| 75 #define gzwrite MOZ_Z_gzwrite | |
| 76 #define gzprintf MOZ_Z_gzprintf | |
| 77 #define gzvprintf MOZ_Z_gzvprintf | |
| 78 #define gzputs MOZ_Z_gzputs | |
| 79 #define gzgets MOZ_Z_gzgets | |
| 80 #define gzputc MOZ_Z_gzputc | |
| 81 #define gzgetc MOZ_Z_gzgetc | |
| 82 #define gzgetc_ MOZ_Z_gzgetc_ | |
| 83 #define gzungetc MOZ_Z_gzungetc | |
| 84 #define gzflush MOZ_Z_gzflush | |
| 85 #define gzseek MOZ_Z_gzseek | |
| 86 #define gzrewind MOZ_Z_gzrewind | |
| 87 #define gztell MOZ_Z_gztell | |
| 88 #define gzeof MOZ_Z_gzeof | |
| 89 #define gzclose MOZ_Z_gzclose | |
| 90 #define gzerror MOZ_Z_gzerror | |
| 91 #define gzclearerr MOZ_Z_gzclearerr | |
| 92 #define adler32 MOZ_Z_adler32 | |
| 93 #define crc32 MOZ_Z_crc32 | |
| 94 #define deflateInit_ MOZ_Z_deflateInit_ | |
| 95 #define deflateInit2_ MOZ_Z_deflateInit2_ | |
| 96 #define inflateInit_ MOZ_Z_inflateInit_ | |
| 97 #define inflateInit2_ MOZ_Z_inflateInit2_ | |
| 98 #define inflateBackInit_ MOZ_Z_inflateBackInit_ | |
| 99 #define inflateSyncPoint MOZ_Z_inflateSyncPoint | |
| 100 #define get_crc_table MOZ_Z_get_crc_table | |
| 101 #define zError MOZ_Z_zError | |
| 102 | |
| 103 /* Extra global symbols */ | |
| 104 #define _dist_code MOZ_Z__dist_code | |
| 105 #define _length_code MOZ_Z__length_code | |
| 106 #define _tr_align MOZ_Z__tr_align | |
| 107 #define _tr_flush_block MOZ_Z__tr_flush_block | |
| 108 #define _tr_init MOZ_Z__tr_init | |
| 109 #define _tr_stored_block MOZ_Z__tr_stored_block | |
| 110 #define _tr_tally MOZ_Z__tr_tally | |
| 111 #define deflate_copyright MOZ_Z_deflate_copyright | |
| 112 #define inflate_copyright MOZ_Z_inflate_copyright | |
| 113 #define inflate_fast MOZ_Z_inflate_fast | |
| 114 #define inflate_table MOZ_Z_inflate_table | |
| 115 #define z_errmsg MOZ_Z_z_errmsg | |
| 116 #define zcalloc MOZ_Z_zcalloc | |
| 117 #define zcfree MOZ_Z_zcfree | |
| 118 #define alloc_func MOZ_Z_alloc_func | |
| 119 #define free_func MOZ_Z_free_func | |
| 120 #define in_func MOZ_Z_in_func | |
| 121 #define out_func MOZ_Z_out_func | |
| 122 | |
| 123 /* New as of libpng-1.2.3 */ | |
| 124 #define adler32_combine MOZ_Z_adler32_combine | |
| 125 #define crc32_combine MOZ_Z_crc32_combine | |
| 126 #define deflateSetHeader MOZ_Z_deflateSetHeader | |
| 127 #define deflateTune MOZ_Z_deflateTune | |
| 128 #define gzdirect MOZ_Z_gzdirect | |
| 129 #define inflatePrime MOZ_Z_inflatePrime | |
| 130 #define inflateGetHeader MOZ_Z_inflateGetHeader | |
| 131 | |
| 132 /* New as of zlib 1.2.5 */ | |
| 133 #define gzoffset MOZ_Z_gzoffset | |
| 134 #define gzopen64 MOZ_Z_gzopen64 | |
| 135 #define gzseek64 MOZ_Z_gzseek64 | |
| 136 #define gztell64 MOZ_Z_gztell64 | |
| 137 #define gzoffset64 MOZ_Z_gzoffset64 | |
| 138 #define adler32_combine64 MOZ_Z_adler32_combine64 | |
| 139 #define crc32_combine64 MOZ_Z_crc32_combine64 | |
| 140 #define gz_error MOZ_Z_gz_error | |
| 141 #define gz_intmax MOZ_Z_gz_intmax | |
| 142 #define gz_strwinerror MOZ_Z_gz_strwinerror | |
| 143 #define gzbuffer MOZ_Z_gzbuffer | |
| 144 #define gzclose_r MOZ_Z_gzclose_r | |
| 145 #define gzclose_w MOZ_Z_gzclose_w | |
| 146 #define inflateMark MOZ_Z_inflateMark | |
| 147 #define inflateReset2 MOZ_Z_inflateReset2 | |
| 148 #define inflateUndermine MOZ_Z_inflateUndermine | |
| 149 #define charf MOZ_Z_charf | |
| 150 #define gzFile MOZ_Z_gzFile | |
| 151 #define gz_header MOZ_Z_gz_header | |
| 152 #define gz_headerp MOZ_Z_gz_headerp | |
| 153 #define intf MOZ_Z_intf | |
| 154 #define uInt MOZ_Z_uInt | |
| 155 #define uIntf MOZ_Z_uIntf | |
| 156 #define uLong MOZ_Z_uLong | |
| 157 #define uLongf MOZ_Z_uLongf | |
| 158 #define voidp MOZ_Z_voidp | |
| 159 #define voidpc MOZ_Z_voidpc | |
| 160 #define voidpf MOZ_Z_voidpf | |
| 161 #define gz_header_s MOZ_Z_gz_header_s | |
| 162 #define internal_state MOZ_Z_internal_state | |
| 163 | |
| 164 /* New as of zlib 1.2.8 */ | |
| 165 #define _tr_flush_bits MOZ_Z__tr_flush_bits | |
| 166 #define deflateResetKeep MOZ_Z_deflateResetKeep | |
| 167 #define deflatePending MOZ_Z_deflatePending | |
| 168 #define inflateGetDictionary MOZ_Z_inflateGetDictionary | |
| 169 #define inflateResetKeep MOZ_Z_inflateResetKeep | |
| 170 #define gzopen_w MOZ_Z_gzopen_w | |
| 171 | |
| 172 /* Chromium-specific modifications */ | |
| 173 #define copy_with_crc MOZ_Z__copy_with_crc | |
| 174 #define crc_finalize MOZ_Z__crc_finalize | |
| 175 #define crc_reset MOZ_Z__crc_reset | |
| 176 // read_buf used to be local, but this was changed in simd.patch. | |
| 177 #define read_buf MOZ_Z__read_buf | |
| 178 #define x86_check_features MOZ_Z__x86_check_features | |
| 179 | |
| 180 /* Mangle Byte types except on Mac. */ | |
| 181 #if !defined(__MACTYPES__) | |
| 182 #define Byte MOZ_Z_Byte | |
| 183 #define Bytef MOZ_Z_Bytef | |
| 184 #endif | |
| 185 | |
| 186 #endif | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2690623003:
Update zlib to 1.2.11 (Closed)
