diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-05 06:10:16 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-05 06:10:16 +0000 |
| commit | 771947f7607661e13357caebb7c2b27dc474be88 (patch) | |
| tree | 5f6fa6ac96082df8d29f43504965c405cf7afaa2 /plugins/Zlib/src/zutil.h | |
| parent | cfe8ca0a75ce9dcb2044e6e17f40b294f35d6366 (diff) | |
zlib update to 1.2.8
git-svn-id: http://svn.miranda-ng.org/main/trunk@5582 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Zlib/src/zutil.h')
| -rw-r--r-- | plugins/Zlib/src/zutil.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Zlib/src/zutil.h b/plugins/Zlib/src/zutil.h index 67771583ac..24ab06b1cf 100644 --- a/plugins/Zlib/src/zutil.h +++ b/plugins/Zlib/src/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 @@ -219,7 +220,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # include <stdio.h> extern int ZLIB_INTERNAL z_verbose; extern void ZLIB_INTERNAL z_error OF((char *m)); -# define Assert(cond,msg) {if (!(cond)) z_error(msg);} +# define Assert(cond,msg) {if(!(cond)) z_error(msg);} # define Trace(x) {if (z_verbose>=0) fprintf x ;} # define Tracev(x) {if (z_verbose>0) fprintf x ;} # define Tracevv(x) {if (z_verbose>1) fprintf x ;} |