diff options
| author | Matthias Klose <doko@ubuntu.com> | 2015-11-23 20:27:57 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2015-11-23 20:27:57 +0000 |
| commit | cd9ec14217a566fa0ae12ccf34534cbb7680f5ab (patch) | |
| tree | c0867a0d04452190fa29a7e38ad632c37d5221cd /zlib/zutil.h | |
| parent | 4c93660449ea23e5eee1f8ce3e97129c7974b7fc (diff) | |
| download | gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.zip gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.tar.gz gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.tar.bz2 | |
2015-11-23 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.8; merged local changes.
From-SVN: r230774
Diffstat (limited to 'zlib/zutil.h')
| -rw-r--r-- | zlib/zutil.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zlib/zutil.h b/zlib/zutil.h index ed6b127..1b6fbb8 100644 --- a/zlib/zutil.h +++ b/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 |