| OLD | NEW |
| 1 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | 1 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
| 2 /* ***** BEGIN LICENSE BLOCK ***** | 2 /* ***** BEGIN LICENSE BLOCK ***** |
| 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
| 4 * | 4 * |
| 5 * The contents of this file are subject to the Mozilla Public License Version | 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 | 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 | 7 * the License. You may obtain a copy of the License at |
| 8 * http://www.mozilla.org/MPL/ | 8 * http://www.mozilla.org/MPL/ |
| 9 * | 9 * |
| 10 * Software distributed under the License is distributed on an "AS IS" basis, | 10 * Software distributed under the License is distributed on an "AS IS" basis, |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 #define inflateSync MOZ_Z_inflateSync | 61 #define inflateSync MOZ_Z_inflateSync |
| 62 #define inflateCopy MOZ_Z_inflateCopy | 62 #define inflateCopy MOZ_Z_inflateCopy |
| 63 #define inflateReset MOZ_Z_inflateReset | 63 #define inflateReset MOZ_Z_inflateReset |
| 64 #define inflateBack MOZ_Z_inflateBack | 64 #define inflateBack MOZ_Z_inflateBack |
| 65 #define inflateBackEnd MOZ_Z_inflateBackEnd | 65 #define inflateBackEnd MOZ_Z_inflateBackEnd |
| 66 #define zlibCompileFlags MOZ_Z_zlibCompileFlags | 66 #define zlibCompileFlags MOZ_Z_zlibCompileFlags |
| 67 #define compress MOZ_Z_compress | 67 #define compress MOZ_Z_compress |
| 68 #define compress2 MOZ_Z_compress2 | 68 #define compress2 MOZ_Z_compress2 |
| 69 #define compressBound MOZ_Z_compressBound | 69 #define compressBound MOZ_Z_compressBound |
| 70 #define uncompress MOZ_Z_uncompress | 70 #define uncompress MOZ_Z_uncompress |
| 71 #define gzopen MOZ_Z_gzopen | |
| 72 #define gzdopen MOZ_Z_gzdopen | 71 #define gzdopen MOZ_Z_gzdopen |
| 73 #define gzsetparams MOZ_Z_gzsetparams | 72 #define gzsetparams MOZ_Z_gzsetparams |
| 74 #define gzread MOZ_Z_gzread | 73 #define gzread MOZ_Z_gzread |
| 75 #define gzwrite MOZ_Z_gzwrite | 74 #define gzwrite MOZ_Z_gzwrite |
| 76 #define gzprintf MOZ_Z_gzprintf | 75 #define gzprintf MOZ_Z_gzprintf |
| 77 #define gzputs MOZ_Z_gzputs | 76 #define gzputs MOZ_Z_gzputs |
| 78 #define gzgets MOZ_Z_gzgets | 77 #define gzgets MOZ_Z_gzgets |
| 79 #define gzputc MOZ_Z_gzputc | 78 #define gzputc MOZ_Z_gzputc |
| 80 #define gzgetc MOZ_Z_gzgetc | 79 #define gzgetc MOZ_Z_gzgetc |
| 81 #define gzungetc MOZ_Z_gzungetc | 80 #define gzungetc MOZ_Z_gzungetc |
| 82 #define gzflush MOZ_Z_gzflush | 81 #define gzflush MOZ_Z_gzflush |
| 83 #define gzseek MOZ_Z_gzseek | |
| 84 #define gzrewind MOZ_Z_gzrewind | 82 #define gzrewind MOZ_Z_gzrewind |
| 85 #define gztell MOZ_Z_gztell | |
| 86 #define gzeof MOZ_Z_gzeof | 83 #define gzeof MOZ_Z_gzeof |
| 87 #define gzclose MOZ_Z_gzclose | 84 #define gzclose MOZ_Z_gzclose |
| 88 #define gzerror MOZ_Z_gzerror | 85 #define gzerror MOZ_Z_gzerror |
| 89 #define gzclearerr MOZ_Z_gzclearerr | 86 #define gzclearerr MOZ_Z_gzclearerr |
| 90 #define adler32 MOZ_Z_adler32 | 87 #define adler32 MOZ_Z_adler32 |
| 91 #define crc32 MOZ_Z_crc32 | 88 #define crc32 MOZ_Z_crc32 |
| 92 #define deflateInit_ MOZ_Z_deflateInit_ | 89 #define deflateInit_ MOZ_Z_deflateInit_ |
| 93 #define deflateInit2_ MOZ_Z_deflateInit2_ | 90 #define deflateInit2_ MOZ_Z_deflateInit2_ |
| 94 #define inflateInit_ MOZ_Z_inflateInit_ | 91 #define inflateInit_ MOZ_Z_inflateInit_ |
| 95 #define inflateInit2_ MOZ_Z_inflateInit2_ | 92 #define inflateInit2_ MOZ_Z_inflateInit2_ |
| (...skipping 16 matching lines...) Expand all Loading... |
| 112 #define inflate_table MOZ_Z_inflate_table | 109 #define inflate_table MOZ_Z_inflate_table |
| 113 #define z_errmsg MOZ_Z_z_errmsg | 110 #define z_errmsg MOZ_Z_z_errmsg |
| 114 #define zcalloc MOZ_Z_zcalloc | 111 #define zcalloc MOZ_Z_zcalloc |
| 115 #define zcfree MOZ_Z_zcfree | 112 #define zcfree MOZ_Z_zcfree |
| 116 #define alloc_func MOZ_Z_alloc_func | 113 #define alloc_func MOZ_Z_alloc_func |
| 117 #define free_func MOZ_Z_free_func | 114 #define free_func MOZ_Z_free_func |
| 118 #define in_func MOZ_Z_in_func | 115 #define in_func MOZ_Z_in_func |
| 119 #define out_func MOZ_Z_out_func | 116 #define out_func MOZ_Z_out_func |
| 120 | 117 |
| 121 /* New as of libpng-1.2.3 */ | 118 /* New as of libpng-1.2.3 */ |
| 122 #define adler32_combine MOZ_Z_adler32_combine | |
| 123 #define crc32_combine MOZ_Z_crc32_combine | |
| 124 #define deflateSetHeader MOZ_Z_deflateSetHeader | 119 #define deflateSetHeader MOZ_Z_deflateSetHeader |
| 125 #define deflateTune MOZ_Z_deflateTune | 120 #define deflateTune MOZ_Z_deflateTune |
| 126 #define gzdirect MOZ_Z_gzdirect | 121 #define gzdirect MOZ_Z_gzdirect |
| 127 #define inflatePrime MOZ_Z_inflatePrime | 122 #define inflatePrime MOZ_Z_inflatePrime |
| 128 #define inflateGetHeader MOZ_Z_inflateGetHeader | 123 #define inflateGetHeader MOZ_Z_inflateGetHeader |
| 129 | 124 |
| 125 /* New as of zlib 1.2.5 */ |
| 126 #define gz_error MOZ_Z_gz_error |
| 127 #define gz_intmax MOZ_Z_gz_intmax |
| 128 #define gz_strwinerror MOZ_Z_gz_strwinerror |
| 129 #define gzbuffer MOZ_Z_gzbuffer |
| 130 #define gzclose_r MOZ_Z_gzclose_r |
| 131 #define gzclose_w MOZ_Z_gzclose_w |
| 132 #define inflateMark MOZ_Z_inflateMark |
| 133 #define inflateReset2 MOZ_Z_inflateReset2 |
| 134 #define inflateUndermine MOZ_Z_inflateUndermine |
| 135 #define charf MOZ_Z_charf |
| 136 #define gzFile MOZ_Z_gzFile |
| 137 #define gz_header MOZ_Z_gz_header |
| 138 #define gz_headerp MOZ_Z_gz_headerp |
| 139 #define intf MOZ_Z_intf |
| 140 #define uInt MOZ_Z_uInt |
| 141 #define uIntf MOZ_Z_uIntf |
| 142 #define uLong MOZ_Z_uLong |
| 143 #define uLongf MOZ_Z_uLongf |
| 144 #define voidp MOZ_Z_voidp |
| 145 #define voidpc MOZ_Z_voidpc |
| 146 #define voidpf MOZ_Z_voidpf |
| 147 #define gz_header_s MOZ_Z_gz_header_s |
| 148 #define internal_state MOZ_Z_internal_state |
| 149 |
| 150 /* Mangle Byte types except on Mac. */ |
| 151 #if !defined(__MACTYPES__) |
| 152 #define Byte MOZ_Z_Byte |
| 153 #define Bytef MOZ_Z_Bytef |
| 130 #endif | 154 #endif |
| 155 |
| 156 /* Mangle only 64-bit functions on platforms which support 64-bit files to avoid |
| 157 * conflicts with manglings in zlib.h. */ |
| 158 #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 |
| 159 #define gzopen64 MOZ_Z_gzopen64 |
| 160 #define gzseek64 MOZ_Z_gzseek64 |
| 161 #define gztell64 MOZ_Z_gztell64 |
| 162 #define gzoffset64 MOZ_Z_gzoffset64 |
| 163 #define adler32_combine64 MOZ_Z_adler32_combine64 |
| 164 #define crc32_combine64 MOZ_Z_crc32_combine64 |
| 165 #else |
| 166 #define gzopen MOZ_Z_gzopen |
| 167 #define gzseek MOZ_Z_gzseek |
| 168 #define gztell MOZ_Z_gztell |
| 169 #define gzoffset MOZ_Z_gzoffset |
| 170 #define adler32_combine MOZ_Z_adler32_combine |
| 171 #define crc32_combine MOZ_Z_crc32_combine |
| 172 #endif |
| 173 |
| 174 #endif |
| OLD | NEW |