diff options
| author | Nayd <dnpd.dd@gmail.com> | 2014-12-24 17:45:29 +0000 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2014-12-24 17:45:29 +0000 |
| commit | 09f57db03d352a12d18d06a9c1616045f233dc4d (patch) | |
| tree | 42859cfd2326884b3325345b96f21b2cb1136ebb /dep/zlib/zutil.h | |
| parent | 33a492e822425506884f5ca3d3baef8d5d7d94d7 (diff) | |
Dep/zlib: Update zlib from version 1.2.7 to 1.2.8
"Version 1.2.8 fixes a very rare bug in decompression. All users are encouraged to upgrade immediately. Version 1.2.8 also has these improvements:
Add new inflateGetDictionary() function
Fix bug where gzopen() immediately followed by gzclose() would write an empty file instead of an empty gzip stream.
Fix bug in gzclose() when gzwrite() runs out of memory"
Diffstat (limited to 'dep/zlib/zutil.h')
| -rw-r--r-- | dep/zlib/zutil.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dep/zlib/zutil.h b/dep/zlib/zutil.h index 4e3dcc6ae9f..24ab06b1cf6 100644 --- a/dep/zlib/zutil.h +++ b/dep/zlib/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2012 Jean-loup Gailly. + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -44,13 +44,13 @@ typedef unsigned short ush; typedef ush FAR ushf; typedef unsigned long ulg; -extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) + return (strm->msg = ERR_MSG(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */ @@ -168,7 +168,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif /* provide prototypes for these when building zlib without LFS */ -#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) +#if !defined(_WIN32) && \ + (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); #endif |