diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:00:45 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:00:45 (GMT) |
| commit | a733cde27c904a40aae56e93c7daa369e2a4d045 (patch) | |
| tree | 77fdf9d45381002ae272a660dd3090c4d9459dc5 /compat/zlib/zutil.h | |
| parent | 133a3b34b7419b202d6588f44871ea67176a5064 (diff) | |
| parent | 2b3657769b1d0b9ae6e10113b1d3c038b4967899 (diff) | |
| download | tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.zip tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.tar.gz tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.tar.bz2 | |
merge trunk
Diffstat (limited to 'compat/zlib/zutil.h')
| -rw-r--r-- | compat/zlib/zutil.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compat/zlib/zutil.h b/compat/zlib/zutil.h index 4e3dcc6..24ab06b 100644 --- a/compat/zlib/zutil.h +++ b/compat/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 |