zconf.h.in (muscle7.61) | : | zconf.h.in (muscle7.62) | ||
---|---|---|---|---|
/* zconf.h -- configuration of the zlib compression library | /* zconf.h -- configuration of the zlib compression library | |||
* Copyright (C) 1995-2013 Jean-loup Gailly. | * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | * For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | */ | |||
/* @(#) $Id$ */ | /* @(#) $Id$ */ | |||
#ifndef ZCONF_H | #ifndef ZCONF_H | |||
#define ZCONF_H | #define ZCONF_H | |||
/* | /* | |||
* If you *really* need a unique prefix for all types and library functions, | * If you *really* need a unique prefix for all types and library functions, | |||
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. | * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. | |||
* Even better than compiling with -DZ_PREFIX would be to use configure to set | * Even better than compiling with -DZ_PREFIX would be to use configure to set | |||
* this permanently in zconf.h using "./configure --zprefix". | * this permanently in zconf.h using "./configure --zprefix". | |||
*/ | */ | |||
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ | #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ | |||
# define Z_PREFIX_SET | # define Z_PREFIX_SET | |||
/* all linked symbols */ | /* all linked symbols and init macros */ | |||
# define _dist_code z__dist_code | # define _dist_code z__dist_code | |||
# define _length_code z__length_code | # define _length_code z__length_code | |||
# define _tr_align z__tr_align | # define _tr_align z__tr_align | |||
# define _tr_flush_bits z__tr_flush_bits | # define _tr_flush_bits z__tr_flush_bits | |||
# define _tr_flush_block z__tr_flush_block | # define _tr_flush_block z__tr_flush_block | |||
# define _tr_init z__tr_init | # define _tr_init z__tr_init | |||
# define _tr_stored_block z__tr_stored_block | # define _tr_stored_block z__tr_stored_block | |||
# define _tr_tally z__tr_tally | # define _tr_tally z__tr_tally | |||
# define adler32 z_adler32 | # define adler32 z_adler32 | |||
# define adler32_combine z_adler32_combine | # define adler32_combine z_adler32_combine | |||
# define adler32_combine64 z_adler32_combine64 | # define adler32_combine64 z_adler32_combine64 | |||
# define adler32_z z_adler32_z | ||||
# ifndef Z_SOLO | # ifndef Z_SOLO | |||
# define compress z_compress | # define compress z_compress | |||
# define compress2 z_compress2 | # define compress2 z_compress2 | |||
# define compressBound z_compressBound | # define compressBound z_compressBound | |||
# endif | # endif | |||
# define crc32 z_crc32 | # define crc32 z_crc32 | |||
# define crc32_combine z_crc32_combine | # define crc32_combine z_crc32_combine | |||
# define crc32_combine64 z_crc32_combine64 | # define crc32_combine64 z_crc32_combine64 | |||
# define crc32_z z_crc32_z | ||||
# define deflate z_deflate | # define deflate z_deflate | |||
# define deflateBound z_deflateBound | # define deflateBound z_deflateBound | |||
# define deflateCopy z_deflateCopy | # define deflateCopy z_deflateCopy | |||
# define deflateEnd z_deflateEnd | # define deflateEnd z_deflateEnd | |||
# define deflateGetDictionary z_deflateGetDictionary | ||||
# define deflateInit z_deflateInit | ||||
# define deflateInit2 z_deflateInit2 | ||||
# define deflateInit2_ z_deflateInit2_ | # define deflateInit2_ z_deflateInit2_ | |||
# define deflateInit_ z_deflateInit_ | # define deflateInit_ z_deflateInit_ | |||
# define deflateParams z_deflateParams | # define deflateParams z_deflateParams | |||
# define deflatePending z_deflatePending | # define deflatePending z_deflatePending | |||
# define deflatePrime z_deflatePrime | # define deflatePrime z_deflatePrime | |||
# define deflateReset z_deflateReset | # define deflateReset z_deflateReset | |||
# define deflateResetKeep z_deflateResetKeep | # define deflateResetKeep z_deflateResetKeep | |||
# define deflateSetDictionary z_deflateSetDictionary | # define deflateSetDictionary z_deflateSetDictionary | |||
# define deflateSetHeader z_deflateSetHeader | # define deflateSetHeader z_deflateSetHeader | |||
# define deflateTune z_deflateTune | # define deflateTune z_deflateTune | |||
skipping to change at line 70 | skipping to change at line 75 | |||
# define gzbuffer z_gzbuffer | # define gzbuffer z_gzbuffer | |||
# define gzclearerr z_gzclearerr | # define gzclearerr z_gzclearerr | |||
# define gzclose z_gzclose | # define gzclose z_gzclose | |||
# define gzclose_r z_gzclose_r | # define gzclose_r z_gzclose_r | |||
# define gzclose_w z_gzclose_w | # define gzclose_w z_gzclose_w | |||
# define gzdirect z_gzdirect | # define gzdirect z_gzdirect | |||
# define gzdopen z_gzdopen | # define gzdopen z_gzdopen | |||
# define gzeof z_gzeof | # define gzeof z_gzeof | |||
# define gzerror z_gzerror | # define gzerror z_gzerror | |||
# define gzflush z_gzflush | # define gzflush z_gzflush | |||
# define gzfread z_gzfread | ||||
# define gzfwrite z_gzfwrite | ||||
# define gzgetc z_gzgetc | # define gzgetc z_gzgetc | |||
# define gzgetc_ z_gzgetc_ | # define gzgetc_ z_gzgetc_ | |||
# define gzgets z_gzgets | # define gzgets z_gzgets | |||
# define gzoffset z_gzoffset | # define gzoffset z_gzoffset | |||
# define gzoffset64 z_gzoffset64 | # define gzoffset64 z_gzoffset64 | |||
# define gzopen z_gzopen | # define gzopen z_gzopen | |||
# define gzopen64 z_gzopen64 | # define gzopen64 z_gzopen64 | |||
# ifdef _WIN32 | # ifdef _WIN32 | |||
# define gzopen_w z_gzopen_w | # define gzopen_w z_gzopen_w | |||
# endif | # endif | |||
# define gzprintf z_gzprintf | # define gzprintf z_gzprintf | |||
# define gzvprintf z_gzvprintf | ||||
# define gzputc z_gzputc | # define gzputc z_gzputc | |||
# define gzputs z_gzputs | # define gzputs z_gzputs | |||
# define gzread z_gzread | # define gzread z_gzread | |||
# define gzrewind z_gzrewind | # define gzrewind z_gzrewind | |||
# define gzseek z_gzseek | # define gzseek z_gzseek | |||
# define gzseek64 z_gzseek64 | # define gzseek64 z_gzseek64 | |||
# define gzsetparams z_gzsetparams | # define gzsetparams z_gzsetparams | |||
# define gztell z_gztell | # define gztell z_gztell | |||
# define gztell64 z_gztell64 | # define gztell64 z_gztell64 | |||
# define gzungetc z_gzungetc | # define gzungetc z_gzungetc | |||
# define gzvprintf z_gzvprintf | ||||
# define gzwrite z_gzwrite | # define gzwrite z_gzwrite | |||
# endif | # endif | |||
# define inflate z_inflate | # define inflate z_inflate | |||
# define inflateBack z_inflateBack | # define inflateBack z_inflateBack | |||
# define inflateBackEnd z_inflateBackEnd | # define inflateBackEnd z_inflateBackEnd | |||
# define inflateBackInit z_inflateBackInit | ||||
# define inflateBackInit_ z_inflateBackInit_ | # define inflateBackInit_ z_inflateBackInit_ | |||
# define inflateCodesUsed z_inflateCodesUsed | ||||
# define inflateCopy z_inflateCopy | # define inflateCopy z_inflateCopy | |||
# define inflateEnd z_inflateEnd | # define inflateEnd z_inflateEnd | |||
# define inflateGetDictionary z_inflateGetDictionary | ||||
# define inflateGetHeader z_inflateGetHeader | # define inflateGetHeader z_inflateGetHeader | |||
# define inflateInit z_inflateInit | ||||
# define inflateInit2 z_inflateInit2 | ||||
# define inflateInit2_ z_inflateInit2_ | # define inflateInit2_ z_inflateInit2_ | |||
# define inflateInit_ z_inflateInit_ | # define inflateInit_ z_inflateInit_ | |||
# define inflateMark z_inflateMark | # define inflateMark z_inflateMark | |||
# define inflatePrime z_inflatePrime | # define inflatePrime z_inflatePrime | |||
# define inflateReset z_inflateReset | # define inflateReset z_inflateReset | |||
# define inflateReset2 z_inflateReset2 | # define inflateReset2 z_inflateReset2 | |||
# define inflateResetKeep z_inflateResetKeep | ||||
# define inflateSetDictionary z_inflateSetDictionary | # define inflateSetDictionary z_inflateSetDictionary | |||
# define inflateGetDictionary z_inflateGetDictionary | ||||
# define inflateSync z_inflateSync | # define inflateSync z_inflateSync | |||
# define inflateSyncPoint z_inflateSyncPoint | # define inflateSyncPoint z_inflateSyncPoint | |||
# define inflateUndermine z_inflateUndermine | # define inflateUndermine z_inflateUndermine | |||
# define inflateResetKeep z_inflateResetKeep | # define inflateValidate z_inflateValidate | |||
# define inflate_copyright z_inflate_copyright | # define inflate_copyright z_inflate_copyright | |||
# define inflate_fast z_inflate_fast | # define inflate_fast z_inflate_fast | |||
# define inflate_table z_inflate_table | # define inflate_table z_inflate_table | |||
# ifndef Z_SOLO | # ifndef Z_SOLO | |||
# define uncompress z_uncompress | # define uncompress z_uncompress | |||
# define uncompress2 z_uncompress2 | ||||
# endif | # endif | |||
# define zError z_zError | # define zError z_zError | |||
# ifndef Z_SOLO | # ifndef Z_SOLO | |||
# define zcalloc z_zcalloc | # define zcalloc z_zcalloc | |||
# define zcfree z_zcfree | # define zcfree z_zcfree | |||
# endif | # endif | |||
# define zlibCompileFlags z_zlibCompileFlags | # define zlibCompileFlags z_zlibCompileFlags | |||
# define zlibVersion z_zlibVersion | # define zlibVersion z_zlibVersion | |||
/* all zlib typedefs in zlib.h and zconf.h */ | /* all zlib typedefs in zlib.h and zconf.h */ | |||
skipping to change at line 227 | skipping to change at line 240 | |||
# define const /* note: need a more gentle solution here */ | # define const /* note: need a more gentle solution here */ | |||
# endif | # endif | |||
#endif | #endif | |||
#if defined(ZLIB_CONST) && !defined(z_const) | #if defined(ZLIB_CONST) && !defined(z_const) | |||
# define z_const const | # define z_const const | |||
#else | #else | |||
# define z_const | # define z_const | |||
#endif | #endif | |||
/* Some Mac compilers merge all .h files incorrectly: */ | #ifdef Z_SOLO | |||
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) | typedef unsigned long z_size_t; | |||
# define NO_DUMMY_DECL | #else | |||
# define z_longlong long long | ||||
# if defined(NO_SIZE_T) | ||||
typedef unsigned NO_SIZE_T z_size_t; | ||||
# elif defined(STDC) | ||||
# include <stddef.h> | ||||
typedef size_t z_size_t; | ||||
# else | ||||
typedef unsigned long z_size_t; | ||||
# endif | ||||
# undef z_longlong | ||||
#endif | #endif | |||
/* Maximum value for memLevel in deflateInit2 */ | /* Maximum value for memLevel in deflateInit2 */ | |||
#ifndef MAX_MEM_LEVEL | #ifndef MAX_MEM_LEVEL | |||
# ifdef MAXSEG_64K | # ifdef MAXSEG_64K | |||
# define MAX_MEM_LEVEL 8 | # define MAX_MEM_LEVEL 8 | |||
# else | # else | |||
# define MAX_MEM_LEVEL 9 | # define MAX_MEM_LEVEL 9 | |||
# endif | # endif | |||
#endif | #endif | |||
skipping to change at line 259 | skipping to change at line 282 | |||
/* The memory requirements for deflate are (in bytes): | /* The memory requirements for deflate are (in bytes): | |||
(1 << (windowBits+2)) + (1 << (memLevel+9)) | (1 << (windowBits+2)) + (1 << (memLevel+9)) | |||
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) | that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) | |||
plus a few kilobytes for small objects. For example, if you want to reduce | plus a few kilobytes for small objects. For example, if you want to reduce | |||
the default memory requirements from 256K to 128K, compile with | the default memory requirements from 256K to 128K, compile with | |||
make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" | make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" | |||
Of course this will generally degrade compression (there's no free lunch). | Of course this will generally degrade compression (there's no free lunch). | |||
The memory requirements for inflate are (in bytes) 1 << windowBits | The memory requirements for inflate are (in bytes) 1 << windowBits | |||
that is, 32K for windowBits=15 (default value) plus a few kilobytes | that is, 32K for windowBits=15 (default value) plus about 7 kilobytes | |||
for small objects. | for small objects. | |||
*/ | */ | |||
/* Type declarations */ | /* Type declarations */ | |||
#ifndef OF /* function prototypes */ | #ifndef OF /* function prototypes */ | |||
# ifdef STDC | # ifdef STDC | |||
# define OF(args) args | # define OF(args) args | |||
# else | # else | |||
# define OF(args) () | # define OF(args) () | |||
End of changes. 18 change blocks. | ||||
9 lines changed or deleted | 32 lines changed or added |