diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-05-09 00:34:31 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-10 00:06:23 +0200 |
| commit | 5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d (patch) | |
| tree | 88a9dda6136c596d1ac48063e7f05b7aec5561a8 /lib/zlib/zutil.h | |
| parent | Network: Fixed ServerHandle's address formatting. (diff) | |
| download | cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.tar cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.tar.gz cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.tar.bz2 cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.tar.lz cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.tar.xz cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.tar.zst cuberite-5a3c3447b7d7957e3ccfa7e3b09ca83e3637ea1d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | lib/zlib/zutil.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/zlib/zutil.h b/lib/zlib/zutil.h index 4e3dcc6ae..24ab06b1c 100644 --- a/lib/zlib/zutil.h +++ b/lib/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 |