summaryrefslogtreecommitdiff
path: root/zutil.h
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:21:47 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:21:47 -0700
commit7c2a874e50b871d04fbd19501f7b42cff55e5abc (patch)
tree1879cd29182ababb17cde77cee5ce74505db4006 /zutil.h
parenta383133c4e7b93113cee912f213cf9502d785fa7 (diff)
downloadzlib-7c2a874e50b871d04fbd19501f7b42cff55e5abc.tar.gz
zlib-7c2a874e50b871d04fbd19501f7b42cff55e5abc.tar.bz2
zlib-7c2a874e50b871d04fbd19501f7b42cff55e5abc.zip
zlib 1.2.0v1.2.0
Diffstat (limited to 'zutil.h')
-rw-r--r--zutil.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/zutil.h b/zutil.h
index 718ebc1..d9c36ab 100644
--- a/zutil.h
+++ b/zutil.h
@@ -1,5 +1,5 @@
1/* zutil.h -- internal interface and configuration of the compression library 1/* zutil.h -- internal interface and configuration of the compression library
2 * Copyright (C) 1995-2002 Jean-loup Gailly. 2 * Copyright (C) 1995-2003 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -37,7 +37,7 @@ typedef unsigned short ush;
37typedef ush FAR ushf; 37typedef ush FAR ushf;
38typedef unsigned long ulg; 38typedef unsigned long ulg;
39 39
40extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ 40extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
41/* (size given to avoid silly warnings with Visual C++) */ 41/* (size given to avoid silly warnings with Visual C++) */
42 42
43#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] 43#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
@@ -207,8 +207,6 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
207#endif 207#endif
208 208
209 209
210typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
211 uInt len));
212voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); 210voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
213void zcfree OF((voidpf opaque, voidpf ptr)); 211void zcfree OF((voidpf opaque, voidpf ptr));
214 212