summaryrefslogtreecommitdiffstats
path: root/lib/zlib/zutil.h
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2015-07-12 14:46:33 +0200
committerJulian Laubstein <julianlaubstein@yahoo.de>2015-07-12 14:46:33 +0200
commit9b3b0470046bad345f6731d6327ed18ab8f933f2 (patch)
treee38c2864ebaff225774f2abb287ffa9ff71f2502 /lib/zlib/zutil.h
parentMerge pull request #2328 from SamJBarney/master (diff)
parentAdded JsonCPP library location to search paths (diff)
downloadcuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.gz
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.bz2
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.lz
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.xz
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.zst
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.zip
Diffstat (limited to 'lib/zlib/zutil.h')
-rw-r--r--lib/zlib/zutil.h9
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