aboutsummaryrefslogtreecommitdiff
path: root/zlib/zutil.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 13:48:44 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 13:51:05 +0100
commit4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (patch)
treeee8a24a92b267f48542eaed1968266a76e945a27 /zlib/zutil.h
parentb73c544c61712f7bd57f3c9a0f6046481f58038b (diff)
downloadvcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.tar.gz
vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.tar.bz2
vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.zip
Updated zlib to 1.2.8
Diffstat (limited to 'zlib/zutil.h')
-rw-r--r--zlib/zutil.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/zlib/zutil.h b/zlib/zutil.h
index 4e3dcc6ae..24ab06b1c 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