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

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

Issue 2669053004: Remove mixed-source.patch from zlib. (Closed)
Patch Set: delete mixed-source.patch 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 unified diff | Download patch
« no previous file with comments | « third_party/zlib/simd.patch ('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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 z_const char *msg; /* last error message, NULL if no error */ 94 z_const char *msg; /* last error message, NULL if no error */
95 struct internal_state FAR *state; /* not visible by applications */ 95 struct internal_state FAR *state; /* not visible by applications */
96 96
97 alloc_func zalloc; /* used to allocate the internal state */ 97 alloc_func zalloc; /* used to allocate the internal state */
98 free_func zfree; /* used to free the internal state */ 98 free_func zfree; /* used to free the internal state */
99 voidpf opaque; /* private data object passed to zalloc and zfree */ 99 voidpf opaque; /* private data object passed to zalloc and zfree */
100 100
101 int data_type; /* best guess about the data type: binary or text */ 101 int data_type; /* best guess about the data type: binary or text */
102 uLong adler; /* adler32 value of the uncompressed data */ 102 uLong adler; /* adler32 value of the uncompressed data */
103 uLong reserved; /* reserved for future use */ 103 uLong reserved; /* reserved for future use */
104 int clas;
105 } z_stream; 104 } z_stream;
106 105
107 typedef z_stream FAR *z_streamp; 106 typedef z_stream FAR *z_streamp;
108 107
109 /* 108 /*
110 gzip header information passed to and from zlib routines. See RFC 1952 109 gzip header information passed to and from zlib routines. See RFC 1952
111 for more details on the meanings of these fields. 110 for more details on the meanings of these fields.
112 */ 111 */
113 typedef struct gz_header_s { 112 typedef struct gz_header_s {
114 int text; /* true if compressed data believed to be text */ 113 int text; /* true if compressed data believed to be text */
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 #define Z_TEXT 1 200 #define Z_TEXT 1
202 #define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ 201 #define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
203 #define Z_UNKNOWN 2 202 #define Z_UNKNOWN 2
204 /* Possible values of the data_type field (though see inflate()) */ 203 /* Possible values of the data_type field (though see inflate()) */
205 204
206 #define Z_DEFLATED 8 205 #define Z_DEFLATED 8
207 /* The deflate compression method (the only one supported in this version) */ 206 /* The deflate compression method (the only one supported in this version) */
208 207
209 #define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ 208 #define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
210 209
211 #define Z_CLASS_STANDARD 0
212 #define Z_CLASS_COOKIE 1
213 #define Z_CLASS_HUFFMAN_ONLY 2
214
215 #define zlib_version zlibVersion() 210 #define zlib_version zlibVersion()
216 /* for compatibility with versions < 1.0.2 */ 211 /* for compatibility with versions < 1.0.2 */
217 212
218 213
219 /* basic functions */ 214 /* basic functions */
220 215
221 ZEXTERN const char * ZEXPORT zlibVersion OF((void)); 216 ZEXTERN const char * ZEXPORT zlibVersion OF((void));
222 /* The application can compare zlibVersion and ZLIB_VERSION for consistency. 217 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
223 If the first character differs, the library code actually used is not 218 If the first character differs, the library code actually used is not
224 compatible with the zlib.h header file used by the application. This check 219 compatible with the zlib.h header file used by the application. This check
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1742 # endif 1737 # endif
1743 # define crc32_combine crc32_combine64 1738 # define crc32_combine crc32_combine64
1744 # endif 1739 # endif
1745 # ifndef Z_LARGE64 1740 # ifndef Z_LARGE64
1746 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); 1741 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
1747 ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); 1742 ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
1748 ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); 1743 ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
1749 ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); 1744 ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
1750 ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); 1745 ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
1751 ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); 1746 ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
1752 # else
1753 ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
1754 ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
1755 ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
1756 ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
1757 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
1758 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
1759 # endif 1747 # endif
1760 #else 1748 #else
1761 ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); 1749 ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
1762 ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); 1750 ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
1763 ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); 1751 ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
1764 ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); 1752 ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
1765 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); 1753 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
1766 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); 1754 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
1767 #endif 1755 #endif
1768 1756
(...skipping 26 matching lines...) Expand all
1795 const char *format, 1783 const char *format,
1796 va_list va)); 1784 va_list va));
1797 # endif 1785 # endif
1798 #endif 1786 #endif
1799 1787
1800 #ifdef __cplusplus 1788 #ifdef __cplusplus
1801 } 1789 }
1802 #endif 1790 #endif
1803 1791
1804 #endif /* ZLIB_H */ 1792 #endif /* ZLIB_H */
OLDNEW
« no previous file with comments | « third_party/zlib/simd.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698