[BACK]Return to zconf.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / zlib

Diff for /embedaddon/rsync/zlib/zconf.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/17 15:09:30 version 1.1.1.2, 2013/10/14 07:51:14
Line 1 Line 1
 /* zconf.h -- configuration of the zlib compression library  /* zconf.h -- configuration of the zlib compression library
 * Copyright (C) 1995-2005 Jean-loup Gailly. * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h   * For conditions of distribution and use, see copyright notice in zlib.h
  */   */
   
Line 11 Line 11
 /*  /*
  * 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
    * this permanently in zconf.h using "./configure --zprefix".
  */   */
#ifdef Z_PREFIX#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
#  define deflateInit_          z_deflateInit_#  define Z_PREFIX_SET
 
 /* all linked symbols */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
 #  define _tr_flush_bits        z__tr_flush_bits
 #  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
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
 #    define compressBound         z_compressBound
 #  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
 #  define deflate               z_deflate  #  define deflate               z_deflate
   #  define deflateBound          z_deflateBound
   #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd  #  define deflateEnd            z_deflateEnd
 #  define inflateInit_          z_inflateInit_  
 #  define inflate               z_inflate  
 #  define inflateEnd            z_inflateEnd  
 #  define deflateInit2_         z_deflateInit2_  #  define deflateInit2_         z_deflateInit2_
#  define deflateSetDictionary  z_deflateSetDictionary#  define deflateInit_          z_deflateInit_
#  define deflateCopy           z_deflateCopy 
#  define deflateReset          z_deflateReset 
 #  define deflateParams         z_deflateParams  #  define deflateParams         z_deflateParams
#  define deflateBound          z_deflateBound#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime  #  define deflatePrime          z_deflatePrime
   #  define deflateReset          z_deflateReset
   #  define deflateResetKeep      z_deflateResetKeep
   #  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
   #  ifndef Z_SOLO
   #    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 gzgetc_               z_gzgetc_
   #    define gzgets                z_gzgets
   #    define gzoffset              z_gzoffset
   #    define gzoffset64            z_gzoffset64
   #    define gzopen                z_gzopen
   #    define gzopen64              z_gzopen64
   #    ifdef _WIN32
   #      define gzopen_w              z_gzopen_w
   #    endif
   #    define gzprintf              z_gzprintf
   #    define gzvprintf             z_gzvprintf
   #    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
   #  endif
   #  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 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 inflateSetDictionary  z_inflateSetDictionary
   #  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync  #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint  #  define inflateSyncPoint      z_inflateSyncPoint
#  define inflateCopy           z_inflateCopy#  define inflateUndermine      z_inflateUndermine
#  define inflateReset          z_inflateReset#  define inflateResetKeep      z_inflateResetKeep
#  define inflateBack           z_inflateBack#  define inflate_copyright     z_inflate_copyright
#  define inflateBackEnd        z_inflateBackEnd#  define inflate_fast          z_inflate_fast
#  define compress              z_compress#  define inflate_table         z_inflate_table
#  define compress2             z_compress2#  ifndef Z_SOLO
#  define compressBound         z_compressBound#    define uncompress            z_uncompress
#  define uncompress            z_uncompress#  endif
#  define adler32               z_adler32 
#  define crc32                 z_crc32 
#  define get_crc_table         z_get_crc_table 
 #  define zError                z_zError  #  define zError                z_zError
   #  ifndef Z_SOLO
   #    define zcalloc               z_zcalloc
   #    define zcfree                z_zcfree
   #  endif
   #  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 alloc_func            z_alloc_func
   #  define charf                 z_charf
 #  define free_func             z_free_func  #  define free_func             z_free_func
   #  ifndef Z_SOLO
   #    define gzFile                z_gzFile
   #  endif
   #  define gz_header             z_gz_header
   #  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func  #  define in_func               z_in_func
   #  define intf                  z_intf
 #  define out_func              z_out_func  #  define out_func              z_out_func
 #  define Byte                  z_Byte  
 #  define uInt                  z_uInt  #  define uInt                  z_uInt
 #  define uLong                 z_uLong  
 #  define Bytef                 z_Bytef  
 #  define charf                 z_charf  
 #  define intf                  z_intf  
 #  define uIntf                 z_uIntf  #  define uIntf                 z_uIntf
   #  define uLong                 z_uLong
 #  define uLongf                z_uLongf  #  define uLongf                z_uLongf
 #  define voidpf                z_voidpf  
 #  define voidp                 z_voidp  #  define voidp                 z_voidp
   #  define voidpc                z_voidpc
   #  define voidpf                z_voidpf
   
   /* all zlib structs in zlib.h and zconf.h */
   #  define gz_header_s           z_gz_header_s
   #  define internal_state        z_internal_state
   
 #endif  #endif
   
 #if defined(__MSDOS__) && !defined(MSDOS)  #if defined(__MSDOS__) && !defined(MSDOS)
Line 125 Line 218
 #  endif  #  endif
 #endif  #endif
   
   #if defined(ZLIB_CONST) && !defined(z_const)
   #  define z_const const
   #else
   #  define z_const
   #endif
   
 /* Some Mac compilers merge all .h files incorrectly: */  /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)  #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL  #  define NO_DUMMY_DECL
Line 171 Line 270
 #  endif  #  endif
 #endif  #endif
   
   #ifndef Z_ARG /* function prototypes for stdarg */
   #  if defined(STDC) || defined(Z_HAVE_STDARG_H)
   #    define Z_ARG(args)  args
   #  else
   #    define Z_ARG(args)  ()
   #  endif
   #endif
   
 /* The following definitions for FAR are needed only for MSDOS mixed  /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).   * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have   * This was tested only with MSC; for other MSDOS compilers you may have
Line 284  typedef uLong FAR uLongf; Line 391  typedef uLong FAR uLongf;
    typedef Byte       *voidp;     typedef Byte       *voidp;
 #endif  #endif
   
#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
#  include <sys/types.h> /* for off_t */#  include <limits.h>
#  include <unistd.h>    /* for SEEK_* and off_t */#  if (UINT_MAX == 0xffffffffUL)
#  ifdef VMS#    define Z_U4 unsigned
#    include <unixio.h>   /* for off_t */#  elif (ULONG_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned long
 #  elif (USHRT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned short
 #  endif  #  endif
 #  define z_off_t off_t  
 #endif  #endif
#ifndef SEEK_SET
 #ifdef Z_U4
    typedef Z_U4 z_crc_t;
 #else
    typedef unsigned long z_crc_t;
 #endif
 
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
 #ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_STDARG_H
 #endif
 
 #ifdef STDC
 #  ifndef Z_SOLO
 #    include <sys/types.h>      /* for off_t */
 #  endif
 #endif
 
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
 #    include <stdarg.h>         /* for va_list */
 #  endif
 #endif
 
 #ifdef _WIN32
 #  ifndef Z_SOLO
 #    include <stddef.h>         /* for wchar_t */
 #  endif
 #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 defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
 #if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
 #  define Z_HAVE_UNISTD_H
 #endif
 #ifndef Z_SOLO
 #  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
 #    endif
 #    ifndef z_off_t
 #      define z_off_t off_t
 #    endif
 #  endif
 #endif
 
 #if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
 #  define Z_LFS64
 #endif
 
 #if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
 #  define Z_LARGE64
 #endif
 
 #if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
 #  define Z_WANT64
 #endif
 
 #if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */  #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */  #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */  #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif  #endif
   
 #ifndef z_off_t  #ifndef z_off_t
 #  define z_off_t long  #  define z_off_t long
 #endif  #endif
   
#if defined(__OS400__)#if !defined(_WIN32) && defined(Z_LARGE64)
#  define NO_vsnprintf#  define z_off64_t off64_t
#endif#else
#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
#if defined(__MVS__)#    define z_off64_t __int64
#  define NO_vsnprintf#  else
#  ifdef FAR#    define z_off64_t z_off_t
#    undef FAR 
 #  endif  #  endif
 #endif  #endif
   
 /* MVS linker does not support external names larger than 8 bytes */  /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)  #if defined(__MVS__)
#   pragma map(deflateInit_,"DEIN")  #pragma map(deflateInit_,"DEIN")
#   pragma map(deflateInit2_,"DEIN2")  #pragma map(deflateInit2_,"DEIN2")
#   pragma map(deflateEnd,"DEEND")  #pragma map(deflateEnd,"DEEND")
#   pragma map(deflateBound,"DEBND")  #pragma map(deflateBound,"DEBND")
#   pragma map(inflateInit_,"ININ")  #pragma map(inflateInit_,"ININ")
#   pragma map(inflateInit2_,"ININ2")  #pragma map(inflateInit2_,"ININ2")
#   pragma map(inflateEnd,"INEND")  #pragma map(inflateEnd,"INEND")
#   pragma map(inflateSync,"INSY")  #pragma map(inflateSync,"INSY")
#   pragma map(inflateSetDictionary,"INSEDI")  #pragma map(inflateSetDictionary,"INSEDI")
#   pragma map(compressBound,"CMBND")  #pragma map(compressBound,"CMBND")
#   pragma map(inflate_table,"INTABL")  #pragma map(inflate_table,"INTABL")
#   pragma map(inflate_fast,"INFA")  #pragma map(inflate_fast,"INFA")
#   pragma map(inflate_copyright,"INCOPY")  #pragma map(inflate_copyright,"INCOPY")
 #endif  #endif
   
 #endif /* ZCONF_H */  #endif /* ZCONF_H */
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>