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

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

Issue 1955383002: Update Zlib to version 1.2.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unzip on win platform Created 4 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 | « third_party/zlib/zlib.h ('k') | third_party/zlib/zutil.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* zutil.h -- internal interface and configuration of the compression library 1 /* zutil.h -- internal interface and configuration of the compression library
2 * Copyright (C) 1995-2010 Jean-loup Gailly. 2 * Copyright (C) 1995-2013 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
6 /* WARNING: this file should *not* be used by applications. It is 6 /* WARNING: this file should *not* be used by applications. It is
7 part of the implementation of the compression library and is 7 part of the implementation of the compression library and is
8 subject to change. Applications should only use zlib.h. 8 subject to change. Applications should only use zlib.h.
9 */ 9 */
10 10
11 /* @(#) $Id$ */ 11 /* @(#) $Id$ */
12 12
13 #ifndef ZUTIL_H 13 #ifndef ZUTIL_H
14 #define ZUTIL_H 14 #define ZUTIL_H
15 15
16 #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) 16 #ifdef HAVE_HIDDEN
17 # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) 17 # define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
18 #else 18 #else
19 # define ZLIB_INTERNAL 19 # define ZLIB_INTERNAL
20 #endif 20 #endif
21 21
22 #include "zlib.h" 22 #include "zlib.h"
23 23
24 #ifdef STDC 24 #if defined(STDC) && !defined(Z_SOLO)
25 # if !(defined(_WIN32_WCE) && defined(_MSC_VER)) 25 # if !(defined(_WIN32_WCE) && defined(_MSC_VER))
26 # include <stddef.h> 26 # include <stddef.h>
27 # endif 27 # endif
28 # include <string.h> 28 # include <string.h>
29 # include <stdlib.h> 29 # include <stdlib.h>
30 #endif 30 #endif
31 #ifdef NO_ERRNO_H 31 #ifdef NO_ERRNO_H
32 # ifdef _WIN32_WCE 32 # ifdef _WIN32_WCE
33 /* The Microsoft C Run-Time Library for Windows CE doesn't have 33 /* The Microsoft C Run-Time Library for Windows CE doesn't have
34 * errno. We define it as a global variable to simplify porting. 34 * errno. We define it as a global variable to simplify porting.
35 * Its value is always 0 and should not be used. We rename it to 35 * Its value is always 0 and should not be used. We rename it to
36 * avoid conflict with other libraries that use the same workaround. 36 * avoid conflict with other libraries that use the same workaround.
37 */ 37 */
38 # define errno z_errno 38 # define errno z_errno
39 # endif 39 # endif
40 extern int errno; 40 extern int errno;
41 #else 41 #else
42 # ifndef _WIN32_WCE 42 # ifndef _WIN32_WCE
43 # include <errno.h> 43 # include <errno.h>
44 # endif 44 # endif
45 #endif 45 #endif
46 46
47 #ifdef Z_SOLO
48 typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
49 #endif
50
47 #ifndef local 51 #ifndef local
48 # define local static 52 # define local static
49 #endif 53 #endif
50 /* compile with -Dlocal if your debugger can't find static symbols */ 54 /* compile with -Dlocal if your debugger can't find static symbols */
51 55
52 typedef unsigned char uch; 56 typedef unsigned char uch;
53 typedef uch FAR uchf; 57 typedef uch FAR uchf;
54 typedef unsigned short ush; 58 typedef unsigned short ush;
55 typedef ush FAR ushf; 59 typedef ush FAR ushf;
56 typedef unsigned long ulg; 60 typedef unsigned long ulg;
57 61
58 extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ 62 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
59 /* (size given to avoid silly warnings with Visual C++) */ 63 /* (size given to avoid silly warnings with Visual C++) */
60 64
61 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] 65 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
62 66
63 #define ERR_RETURN(strm,err) \ 67 #define ERR_RETURN(strm,err) \
64 return (strm->msg = (char*)ERR_MSG(err), (err)) 68 return (strm->msg = ERR_MSG(err), (err))
65 /* To be used only when the state is known to be valid */ 69 /* To be used only when the state is known to be valid */
66 70
67 /* common constants */ 71 /* common constants */
68 72
69 #ifndef DEF_WBITS 73 #ifndef DEF_WBITS
70 # define DEF_WBITS MAX_WBITS 74 # define DEF_WBITS MAX_WBITS
71 #endif 75 #endif
72 /* default windowBits for decompression. MAX_WBITS is for compression only */ 76 /* default windowBits for decompression. MAX_WBITS is for compression only */
73 77
74 #if MAX_MEM_LEVEL >= 8 78 #if MAX_MEM_LEVEL >= 8
(...skipping 11 matching lines...) Expand all
86 #define MIN_MATCH 3 90 #define MIN_MATCH 3
87 #define MAX_MATCH 258 91 #define MAX_MATCH 258
88 /* The minimum and maximum match lengths */ 92 /* The minimum and maximum match lengths */
89 93
90 #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ 94 #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
91 95
92 /* target dependencies */ 96 /* target dependencies */
93 97
94 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) 98 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
95 # define OS_CODE 0x00 99 # define OS_CODE 0x00
96 # if defined(__TURBOC__) || defined(__BORLANDC__) 100 # ifndef Z_SOLO
97 # if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) 101 # if defined(__TURBOC__) || defined(__BORLANDC__)
98 /* Allow compilation with ANSI keywords only enabled */ 102 # if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
99 void _Cdecl farfree( void *block ); 103 /* Allow compilation with ANSI keywords only enabled */
100 void *_Cdecl farmalloc( unsigned long nbytes ); 104 void _Cdecl farfree( void *block );
101 # else 105 void *_Cdecl farmalloc( unsigned long nbytes );
102 # include <alloc.h> 106 # else
107 # include <alloc.h>
108 # endif
109 # else /* MSC or DJGPP */
110 # include <malloc.h>
103 # endif 111 # endif
104 # else /* MSC or DJGPP */
105 # include <malloc.h>
106 # endif 112 # endif
107 #endif 113 #endif
108 114
109 #ifdef AMIGA 115 #ifdef AMIGA
110 # define OS_CODE 0x01 116 # define OS_CODE 0x01
111 #endif 117 #endif
112 118
113 #if defined(VAXC) || defined(VMS) 119 #if defined(VAXC) || defined(VMS)
114 # define OS_CODE 0x02 120 # define OS_CODE 0x02
115 # define F_OPEN(name, mode) \ 121 # define F_OPEN(name, mode) \
116 fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") 122 fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
117 #endif 123 #endif
118 124
119 #if defined(ATARI) || defined(atarist) 125 #if defined(ATARI) || defined(atarist)
120 # define OS_CODE 0x05 126 # define OS_CODE 0x05
121 #endif 127 #endif
122 128
123 #ifdef OS2 129 #ifdef OS2
124 # define OS_CODE 0x06 130 # define OS_CODE 0x06
125 # ifdef M_I86 131 # if defined(M_I86) && !defined(Z_SOLO)
126 # include <malloc.h> 132 # include <malloc.h>
127 # endif 133 # endif
128 #endif 134 #endif
129 135
130 #if defined(MACOS) || defined(TARGET_OS_MAC) 136 #if defined(MACOS) || defined(TARGET_OS_MAC)
131 # define OS_CODE 0x07 137 # define OS_CODE 0x07
132 # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os 138 # ifndef Z_SOLO
133 # include <unix.h> /* for fdopen */ 139 # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
134 # else 140 # include <unix.h> /* for fdopen */
135 # ifndef fdopen 141 # else
136 # define fdopen(fd,mode) NULL /* No fdopen() */ 142 # ifndef fdopen
143 # define fdopen(fd,mode) NULL /* No fdopen() */
144 # endif
137 # endif 145 # endif
138 # endif 146 # endif
139 #endif 147 #endif
140 148
141 #ifdef TOPS20 149 #ifdef TOPS20
142 # define OS_CODE 0x0a 150 # define OS_CODE 0x0a
143 #endif 151 #endif
144 152
145 #ifdef _MSC_VER 153 #ifdef _MSC_VER
146 #define zalign(x) __declspec(align(x)) 154 #define zalign(x) __declspec(align(x))
(...skipping 20 matching lines...) Expand all
167 # define fdopen(fd,mode) NULL /* No fdopen() */ 175 # define fdopen(fd,mode) NULL /* No fdopen() */
168 # ifndef _PTRDIFF_T_DEFINED 176 # ifndef _PTRDIFF_T_DEFINED
169 typedef int ptrdiff_t; 177 typedef int ptrdiff_t;
170 # define _PTRDIFF_T_DEFINED 178 # define _PTRDIFF_T_DEFINED
171 # endif 179 # endif
172 # else 180 # else
173 # define fdopen(fd,type) _fdopen(fd,type) 181 # define fdopen(fd,type) _fdopen(fd,type)
174 # endif 182 # endif
175 #endif 183 #endif
176 184
177 #if defined(__BORLANDC__) 185 #if defined(__BORLANDC__) && !defined(MSDOS)
178 #pragma warn -8004 186 #pragma warn -8004
179 #pragma warn -8008 187 #pragma warn -8008
180 #pragma warn -8066 188 #pragma warn -8066
181 #endif 189 #endif
182 190
183 /* provide prototypes for these when building zlib without LFS */ 191 /* provide prototypes for these when building zlib without LFS */
184 #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 192 #if !defined(_WIN32) && \
193 (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
185 ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); 194 ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
186 ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); 195 ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
187 #endif 196 #endif
188 197
189 /* common defaults */ 198 /* common defaults */
190 199
191 #ifndef OS_CODE 200 #ifndef OS_CODE
192 # define OS_CODE 0x03 /* assume Unix */ 201 # define OS_CODE 0x03 /* assume Unix */
193 #endif 202 #endif
194 203
195 #ifndef F_OPEN 204 #ifndef F_OPEN
196 # define F_OPEN(name, mode) fopen((name), (mode)) 205 # define F_OPEN(name, mode) fopen((name), (mode))
197 #endif 206 #endif
198 207
199 /* functions */ 208 /* functions */
200 209
201 #if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) 210 #if defined(pyr) || defined(Z_SOLO)
202 # ifndef HAVE_VSNPRINTF
203 # define HAVE_VSNPRINTF
204 # endif
205 #endif
206 #if defined(__CYGWIN__)
207 # ifndef HAVE_VSNPRINTF
208 # define HAVE_VSNPRINTF
209 # endif
210 #endif
211 #ifndef HAVE_VSNPRINTF
212 # ifdef MSDOS
213 /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
214 but for now we just assume it doesn't. */
215 # define NO_vsnprintf
216 # endif
217 # ifdef __TURBOC__
218 # define NO_vsnprintf
219 # endif
220 # ifdef WIN32
221 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
222 # if !defined(vsnprintf) && !defined(NO_vsnprintf)
223 # if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
224 # define vsnprintf _vsnprintf
225 # endif
226 # endif
227 # endif
228 # ifdef __SASC
229 # define NO_vsnprintf
230 # endif
231 #endif
232 #ifdef VMS
233 # define NO_vsnprintf
234 #endif
235
236 #if defined(pyr)
237 # define NO_MEMCPY 211 # define NO_MEMCPY
238 #endif 212 #endif
239 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) 213 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
240 /* Use our own functions for small and medium model with MSC <= 5.0. 214 /* Use our own functions for small and medium model with MSC <= 5.0.
241 * You may have to use the same strategy for Borland C (untested). 215 * You may have to use the same strategy for Borland C (untested).
242 * The __SC__ check is for Symantec. 216 * The __SC__ check is for Symantec.
243 */ 217 */
244 # define NO_MEMCPY 218 # define NO_MEMCPY
245 #endif 219 #endif
246 #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) 220 #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
(...skipping 28 matching lines...) Expand all
275 # define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} 249 # define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
276 #else 250 #else
277 # define Assert(cond,msg) 251 # define Assert(cond,msg)
278 # define Trace(x) 252 # define Trace(x)
279 # define Tracev(x) 253 # define Tracev(x)
280 # define Tracevv(x) 254 # define Tracevv(x)
281 # define Tracec(c,x) 255 # define Tracec(c,x)
282 # define Tracecv(c,x) 256 # define Tracecv(c,x)
283 #endif 257 #endif
284 258
285 259 #ifndef Z_SOLO
286 voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, 260 voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
287 unsigned size)); 261 unsigned size));
288 void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); 262 void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
263 #endif
289 264
290 #define ZALLOC(strm, items, size) \ 265 #define ZALLOC(strm, items, size) \
291 (*((strm)->zalloc))((strm)->opaque, (items), (size)) 266 (*((strm)->zalloc))((strm)->opaque, (items), (size))
292 #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) 267 #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
293 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} 268 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
294 269
270 /* Reverse the bytes in a 32-bit value */
271 #define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
272 (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
273
295 #endif /* ZUTIL_H */ 274 #endif /* ZUTIL_H */
OLDNEW
« no previous file with comments | « third_party/zlib/zlib.h ('k') | third_party/zlib/zutil.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698