| Index: third_party/zlib/zconf.h
|
| ===================================================================
|
| --- third_party/zlib/zconf.h (revision 113739)
|
| +++ third_party/zlib/zconf.h (working copy)
|
| @@ -1,65 +1,134 @@
|
| /* zconf.h -- configuration of the zlib compression library
|
| - * Copyright (C) 1995-2005 Jean-loup Gailly.
|
| + * Copyright (C) 1995-2010 Jean-loup Gailly.
|
| * For conditions of distribution and use, see copyright notice in zlib.h
|
| */
|
|
|
| -/* @(#) $Id: zconf.h,v 3.9 2005/08/04 19:14:14 tor%cs.brown.edu Exp $ */
|
| +/* @(#) $Id$ */
|
|
|
| #ifndef ZCONF_H
|
| #define ZCONF_H
|
|
|
| -/* This include does prefixing as below, but with an updated set of names */
|
| -#include "mozzconf.h"
|
| -
|
| /*
|
| * 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.
|
| + * Even better than compiling with -DZ_PREFIX would be to use configure to set
|
| + * this permanently in zconf.h using "./configure --zprefix".
|
| */
|
| -#ifdef Z_PREFIX
|
| -# define deflateInit_ z_deflateInit_
|
| +#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
|
| +
|
| +/* all linked symbols */
|
| +# define _dist_code z__dist_code
|
| +# define _length_code z__length_code
|
| +# define _tr_align z__tr_align
|
| +# define _tr_flush_block z__tr_flush_block
|
| +# define _tr_init z__tr_init
|
| +# define _tr_stored_block z__tr_stored_block
|
| +# define _tr_tally z__tr_tally
|
| +# define adler32 z_adler32
|
| +# define adler32_combine z_adler32_combine
|
| +# define adler32_combine64 z_adler32_combine64
|
| +# define compress z_compress
|
| +# define compress2 z_compress2
|
| +# define compressBound z_compressBound
|
| +# define crc32 z_crc32
|
| +# define crc32_combine z_crc32_combine
|
| +# define crc32_combine64 z_crc32_combine64
|
| # define deflate z_deflate
|
| +# define deflateBound z_deflateBound
|
| +# define deflateCopy z_deflateCopy
|
| # define deflateEnd z_deflateEnd
|
| -# define inflateInit_ z_inflateInit_
|
| -# define inflate z_inflate
|
| -# define inflateEnd z_inflateEnd
|
| # define deflateInit2_ z_deflateInit2_
|
| -# define deflateSetDictionary z_deflateSetDictionary
|
| -# define deflateCopy z_deflateCopy
|
| -# define deflateReset z_deflateReset
|
| +# define deflateInit_ z_deflateInit_
|
| # define deflateParams z_deflateParams
|
| -# define deflateBound z_deflateBound
|
| # define deflatePrime z_deflatePrime
|
| +# define deflateReset z_deflateReset
|
| +# define deflateSetDictionary z_deflateSetDictionary
|
| +# define deflateSetHeader z_deflateSetHeader
|
| +# define deflateTune z_deflateTune
|
| +# define deflate_copyright z_deflate_copyright
|
| +# define get_crc_table z_get_crc_table
|
| +# define gz_error z_gz_error
|
| +# define gz_intmax z_gz_intmax
|
| +# define gz_strwinerror z_gz_strwinerror
|
| +# define gzbuffer z_gzbuffer
|
| +# define gzclearerr z_gzclearerr
|
| +# define gzclose z_gzclose
|
| +# define gzclose_r z_gzclose_r
|
| +# define gzclose_w z_gzclose_w
|
| +# define gzdirect z_gzdirect
|
| +# define gzdopen z_gzdopen
|
| +# define gzeof z_gzeof
|
| +# define gzerror z_gzerror
|
| +# define gzflush z_gzflush
|
| +# define gzgetc z_gzgetc
|
| +# define gzgets z_gzgets
|
| +# define gzoffset z_gzoffset
|
| +# define gzoffset64 z_gzoffset64
|
| +# define gzopen z_gzopen
|
| +# define gzopen64 z_gzopen64
|
| +# define gzprintf z_gzprintf
|
| +# define gzputc z_gzputc
|
| +# define gzputs z_gzputs
|
| +# define gzread z_gzread
|
| +# define gzrewind z_gzrewind
|
| +# define gzseek z_gzseek
|
| +# define gzseek64 z_gzseek64
|
| +# define gzsetparams z_gzsetparams
|
| +# define gztell z_gztell
|
| +# define gztell64 z_gztell64
|
| +# define gzungetc z_gzungetc
|
| +# define gzwrite z_gzwrite
|
| +# define inflate z_inflate
|
| +# define inflateBack z_inflateBack
|
| +# define inflateBackEnd z_inflateBackEnd
|
| +# define inflateBackInit_ z_inflateBackInit_
|
| +# define inflateCopy z_inflateCopy
|
| +# define inflateEnd z_inflateEnd
|
| +# define inflateGetHeader z_inflateGetHeader
|
| # define inflateInit2_ z_inflateInit2_
|
| +# define inflateInit_ z_inflateInit_
|
| +# define inflateMark z_inflateMark
|
| +# define inflatePrime z_inflatePrime
|
| +# define inflateReset z_inflateReset
|
| +# define inflateReset2 z_inflateReset2
|
| # define inflateSetDictionary z_inflateSetDictionary
|
| # define inflateSync z_inflateSync
|
| # define inflateSyncPoint z_inflateSyncPoint
|
| -# define inflateCopy z_inflateCopy
|
| -# define inflateReset z_inflateReset
|
| -# define inflateBack z_inflateBack
|
| -# define inflateBackEnd z_inflateBackEnd
|
| -# define compress z_compress
|
| -# define compress2 z_compress2
|
| -# define compressBound z_compressBound
|
| +# define inflateUndermine z_inflateUndermine
|
| +# define inflate_copyright z_inflate_copyright
|
| +# define inflate_fast z_inflate_fast
|
| +# define inflate_table z_inflate_table
|
| # define uncompress z_uncompress
|
| -# define adler32 z_adler32
|
| -# define crc32 z_crc32
|
| -# define get_crc_table z_get_crc_table
|
| # define zError z_zError
|
| +# define zcalloc z_zcalloc
|
| +# define zcfree z_zcfree
|
| +# define zlibCompileFlags z_zlibCompileFlags
|
| +# define zlibVersion z_zlibVersion
|
|
|
| +/* all zlib typedefs in zlib.h and zconf.h */
|
| +# define Byte z_Byte
|
| +# define Bytef z_Bytef
|
| # define alloc_func z_alloc_func
|
| +# define charf z_charf
|
| # define free_func z_free_func
|
| +# define gzFile z_gzFile
|
| +# define gz_header z_gz_header
|
| +# define gz_headerp z_gz_headerp
|
| # define in_func z_in_func
|
| +# define intf z_intf
|
| # define out_func z_out_func
|
| -# define Byte z_Byte
|
| # define uInt z_uInt
|
| +# define uIntf z_uIntf
|
| # define uLong z_uLong
|
| -# define Bytef z_Bytef
|
| -# define charf z_charf
|
| -# define intf z_intf
|
| -# define uIntf z_uIntf
|
| # define uLongf z_uLongf
|
| +# define voidp z_voidp
|
| +# define voidpc z_voidpc
|
| # define voidpf z_voidpf
|
| -# define voidp z_voidp
|
| +
|
| +/* all zlib structs in zlib.h and zconf.h */
|
| +# define gz_header_s z_gz_header_s
|
| +# define internal_state z_internal_state
|
| +
|
| #endif
|
|
|
| #if defined(__MSDOS__) && !defined(MSDOS)
|
| @@ -287,49 +356,73 @@
|
| typedef Byte *voidp;
|
| #endif
|
|
|
| -#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
|
| -# include <sys/types.h> /* for off_t */
|
| -# include <unistd.h> /* for SEEK_* and off_t */
|
| +#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
| +# define Z_HAVE_UNISTD_H
|
| +#endif
|
| +
|
| +#ifdef STDC
|
| +# include <sys/types.h> /* for off_t */
|
| +#endif
|
| +
|
| +/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
|
| + * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
|
| + * though the former does not conform to the LFS document), but considering
|
| + * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
|
| + * equivalently requesting no 64-bit operations
|
| + */
|
| +#if -_LARGEFILE64_SOURCE - -1 == 1
|
| +# undef _LARGEFILE64_SOURCE
|
| +#endif
|
| +
|
| +#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
|
| +# include <unistd.h> /* for SEEK_* and off_t */
|
| # ifdef VMS
|
| -# include <unixio.h> /* for off_t */
|
| +# include <unixio.h> /* for off_t */
|
| # endif
|
| -# define z_off_t off_t
|
| +# ifndef z_off_t
|
| +# define z_off_t off_t
|
| +# endif
|
| #endif
|
| +
|
| #ifndef SEEK_SET
|
| # define SEEK_SET 0 /* Seek from beginning of file. */
|
| # define SEEK_CUR 1 /* Seek from current position. */
|
| # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
|
| #endif
|
| +
|
| #ifndef z_off_t
|
| # define z_off_t long
|
| #endif
|
|
|
| +#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
|
| +# define z_off64_t off64_t
|
| +#else
|
| +# define z_off64_t z_off_t
|
| +#endif
|
| +
|
| #if defined(__OS400__)
|
| # define NO_vsnprintf
|
| #endif
|
|
|
| #if defined(__MVS__)
|
| # define NO_vsnprintf
|
| -# ifdef FAR
|
| -# undef FAR
|
| -# endif
|
| #endif
|
|
|
| /* MVS linker does not support external names larger than 8 bytes */
|
| #if defined(__MVS__)
|
| -# pragma map(deflateInit_,"DEIN")
|
| -# pragma map(deflateInit2_,"DEIN2")
|
| -# pragma map(deflateEnd,"DEEND")
|
| -# pragma map(deflateBound,"DEBND")
|
| -# pragma map(inflateInit_,"ININ")
|
| -# pragma map(inflateInit2_,"ININ2")
|
| -# pragma map(inflateEnd,"INEND")
|
| -# pragma map(inflateSync,"INSY")
|
| -# pragma map(inflateSetDictionary,"INSEDI")
|
| -# pragma map(compressBound,"CMBND")
|
| -# pragma map(inflate_table,"INTABL")
|
| -# pragma map(inflate_fast,"INFA")
|
| -# pragma map(inflate_copyright,"INCOPY")
|
| + #pragma map(deflateInit_,"DEIN")
|
| + #pragma map(deflateInit2_,"DEIN2")
|
| + #pragma map(deflateEnd,"DEEND")
|
| + #pragma map(deflateBound,"DEBND")
|
| + #pragma map(inflateInit_,"ININ")
|
| + #pragma map(inflateInit2_,"ININ2")
|
| + #pragma map(inflateEnd,"INEND")
|
| + #pragma map(inflateSync,"INSY")
|
| + #pragma map(inflateSetDictionary,"INSEDI")
|
| + #pragma map(compressBound,"CMBND")
|
| + #pragma map(inflate_table,"INTABL")
|
| + #pragma map(inflate_fast,"INFA")
|
| + #pragma map(inflate_copyright,"INCOPY")
|
| #endif
|
|
|
| #endif /* ZCONF_H */
|
|
|
Chromium Code Reviews
