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

Side by Side Diff: core/src/fxcodec/fx_zlib/zlib_v128/zlib.h

Issue 330023004: resolve symbol collsion with zlib 1.2.8 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Add a missing file Created 6 years, 6 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 | « core/include/thirdparties/zlib/zlib.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* zlib.h -- interface of the 'zlib' general purpose compression library 1 /* zlib.h -- interface of the 'zlib' general purpose compression library
2 version 1.2.8, April 28th, 2013 2 version 1.2.8, April 28th, 2013
3 3
4 Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler 4 Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
5 5
6 This software is provided 'as-is', without any express or implied 6 This software is provided 'as-is', without any express or implied
7 warranty. In no event will the authors be held liable for any damages 7 warranty. In no event will the authors be held liable for any damages
8 arising from the use of this software. 8 arising from the use of this software.
9 9
10 Permission is granted to anyone to use this software for any purpose, 10 Permission is granted to anyone to use this software for any purpose,
(...skipping 28 matching lines...) Expand all
39 #define adler32 FPDFAPI_adler32 39 #define adler32 FPDFAPI_adler32
40 #define compress2 FPDFAPI_compress2 40 #define compress2 FPDFAPI_compress2
41 #define compress FPDFAPI_compress 41 #define compress FPDFAPI_compress
42 #define compressBound FPDFAPI_compressBound 42 #define compressBound FPDFAPI_compressBound
43 #define get_crc_table FPDFAPI_get_crc_table 43 #define get_crc_table FPDFAPI_get_crc_table
44 #define crc32 FPDFAPI_crc32 44 #define crc32 FPDFAPI_crc32
45 #define deflateInit_ FPDFAPI_deflateInit_ 45 #define deflateInit_ FPDFAPI_deflateInit_
46 #define deflateInit2_ FPDFAPI_deflateInit2_ 46 #define deflateInit2_ FPDFAPI_deflateInit2_
47 #define deflateSetDictionary FPDFAPI_deflateSetDictionary 47 #define deflateSetDictionary FPDFAPI_deflateSetDictionary
48 #define deflateReset FPDFAPI_deflateReset 48 #define deflateReset FPDFAPI_deflateReset
49 #define deflatePending FPDFAPI_deflatePending
49 #define deflatePrime FPDFAPI_deflatePrime 50 #define deflatePrime FPDFAPI_deflatePrime
50 #define deflateParams FPDFAPI_deflateParams 51 #define deflateParams FPDFAPI_deflateParams
51 #define deflateBound FPDFAPI_deflateBound 52 #define deflateBound FPDFAPI_deflateBound
52 #define deflateSetHeader FPDFAPI_deflateSetHeader 53 #define deflateSetHeader FPDFAPI_deflateSetHeader
53 #define deflateTune FPDFAPI_deflateTune 54 #define deflateTune FPDFAPI_deflateTune
54 #define deflate FPDFAPI_deflate 55 #define deflate FPDFAPI_deflate
55 #define deflateEnd FPDFAPI_deflateEnd 56 #define deflateEnd FPDFAPI_deflateEnd
56 #define deflateCopy FPDFAPI_deflateCopy 57 #define deflateCopy FPDFAPI_deflateCopy
57 #define inflateBackInit_ FPDFAPI_inflateBackInit_ 58 #define inflateBackInit_ FPDFAPI_inflateBackInit_
58 #define inflateBack FPDFAPI_inflateBack 59 #define inflateBack FPDFAPI_inflateBack
(...skipping 17 matching lines...) Expand all
76 #define inflate_fast FPDFAPI_inflate_fast 77 #define inflate_fast FPDFAPI_inflate_fast
77 #define inflate_table FPDFAPI_inflate_table 78 #define inflate_table FPDFAPI_inflate_table
78 #define inflate_copyright FPDFAPI_inflate_copyright 79 #define inflate_copyright FPDFAPI_inflate_copyright
79 #define _length_code FPDFAPI_length_code 80 #define _length_code FPDFAPI_length_code
80 #define _tr_flush_block FPDFAPI_tr_flush_block 81 #define _tr_flush_block FPDFAPI_tr_flush_block
81 #define _dist_code FPDFAPI_dist_code 82 #define _dist_code FPDFAPI_dist_code
82 #define _tr_stored_block FPDFAPI_tr_stored_block 83 #define _tr_stored_block FPDFAPI_tr_stored_block
83 #define _tr_init FPDFAPI_tr_init 84 #define _tr_init FPDFAPI_tr_init
84 #define _tr_align FPDFAPI_tr_align 85 #define _tr_align FPDFAPI_tr_align
85 #define _tr_tally FPDFAPI_tr_tally 86 #define _tr_tally FPDFAPI_tr_tally
87 #define _tr_flush_bits FPDFAPI_tr_flush_bits
86 #define adler32_combine FPDFAPI_adler32_combine 88 #define adler32_combine FPDFAPI_adler32_combine
87 #define inflatePrime FPDFAPI_inflatePrime 89 #define inflatePrime FPDFAPI_inflatePrime
90 #define inflateGetDictionary FPDFAPI_inflateGetDictionary
88 #define inflateGetHeader FPDFAPI_inflateGetHeader 91 #define inflateGetHeader FPDFAPI_inflateGetHeader
89 #define crc32_combine FPDFAPI_crc32_combine 92 #define crc32_combine FPDFAPI_crc32_combine
90 #define inflateReset2 FPDFAPI_inflateReset2 93 #define inflateReset2 FPDFAPI_inflateReset2
91 #define inflateUndermine FPDFAPI_inflateUndermine 94 #define inflateUndermine FPDFAPI_inflateUndermine
92 #define inflateMark FPDFAPI_inflateMark 95 #define inflateMark FPDFAPI_inflateMark
93 #define adler32_combine64 FPDFAPI_adler32_combine64 96 #define adler32_combine64 FPDFAPI_adler32_combine64
97 #define inflateResetKeep FPDFAPI_inflateResetKeep
98 #define deflateResetKeep FPDFAPI_deflateResetKeep
94 99
95 #include "zconf.h" 100 #include "zconf.h"
96 101
97 /* Sunliang.Liu 20100908 sync the config to the old revision. NO_GZIP */ 102 /* Sunliang.Liu 20100908 sync the config to the old revision. NO_GZIP */
98 #define NO_GZIP /* XYQ */ 103 #define NO_GZIP /* XYQ */
99 104
100 #ifdef __cplusplus 105 #ifdef __cplusplus
101 extern "C" { 106 extern "C" {
102 #endif 107 #endif
103 108
(...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 const char *format, 1828 const char *format,
1824 va_list va)); 1829 va_list va));
1825 # endif 1830 # endif
1826 #endif 1831 #endif
1827 1832
1828 #ifdef __cplusplus 1833 #ifdef __cplusplus
1829 } 1834 }
1830 #endif 1835 #endif
1831 1836
1832 #endif /* ZLIB_H */ 1837 #endif /* ZLIB_H */
OLDNEW
« no previous file with comments | « core/include/thirdparties/zlib/zlib.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698