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

Side by Side Diff: third_party/zlib/mozzconf.h

Issue 2121343002: [zlib] Fix unmangled symbols. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify .patch files to reflect current condition Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « third_party/zlib/google.patch ('k') | third_party/zlib/simd.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 #define uIntf MOZ_Z_uIntf 155 #define uIntf MOZ_Z_uIntf
156 #define uLong MOZ_Z_uLong 156 #define uLong MOZ_Z_uLong
157 #define uLongf MOZ_Z_uLongf 157 #define uLongf MOZ_Z_uLongf
158 #define voidp MOZ_Z_voidp 158 #define voidp MOZ_Z_voidp
159 #define voidpc MOZ_Z_voidpc 159 #define voidpc MOZ_Z_voidpc
160 #define voidpf MOZ_Z_voidpf 160 #define voidpf MOZ_Z_voidpf
161 #define gz_header_s MOZ_Z_gz_header_s 161 #define gz_header_s MOZ_Z_gz_header_s
162 #define internal_state MOZ_Z_internal_state 162 #define internal_state MOZ_Z_internal_state
163 163
164 /* New as of zlib 1.2.8 */ 164 /* New as of zlib 1.2.8 */
165 #define _tr_flush_bits MOZ_Z__tr_flush_bits
165 #define deflateResetKeep MOZ_Z_deflateResetKeep 166 #define deflateResetKeep MOZ_Z_deflateResetKeep
166 #define deflatePending MOZ_Z_deflatePending 167 #define deflatePending MOZ_Z_deflatePending
167 #define inflateGetDictionary MOZ_Z_inflateGetDictionary 168 #define inflateGetDictionary MOZ_Z_inflateGetDictionary
168 #define inflateResetKeep MOZ_Z_inflateResetKeep 169 #define inflateResetKeep MOZ_Z_inflateResetKeep
169 #define gzopen_w MOZ_Z_gzopen_w 170 #define gzopen_w MOZ_Z_gzopen_w
170 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
171 /* Mangle Byte types except on Mac. */ 180 /* Mangle Byte types except on Mac. */
172 #if !defined(__MACTYPES__) 181 #if !defined(__MACTYPES__)
173 #define Byte MOZ_Z_Byte 182 #define Byte MOZ_Z_Byte
174 #define Bytef MOZ_Z_Bytef 183 #define Bytef MOZ_Z_Bytef
175 #endif 184 #endif
176 185
177 #endif 186 #endif
OLDNEW
« no previous file with comments | « third_party/zlib/google.patch ('k') | third_party/zlib/simd.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698