Deleted Added
full compact
zconf.h (237691) zconf.h (254069)
1/* zconf.h -- configuration of the zlib compression library
1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2012 Jean-loup Gailly.
2 * Copyright (C) 1995-2013 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */
5
3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */
5
6/* @(#) $FreeBSD: stable/9/lib/libz/zconf.h 237691 2012-06-28 07:08:48Z delphij $ */
6/* @(#) $FreeBSD: stable/9/lib/libz/zconf.h 254069 2013-08-07 19:42:17Z delphij $ */
7
8#ifndef ZCONF_H
9#define ZCONF_H
10
11/*
12 * If you *really* need a unique prefix for all types and library functions,
13 * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
14 * Even better than compiling with -DZ_PREFIX would be to use configure to set
15 * this permanently in zconf.h using "./configure --zprefix".
16 */
17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18# define Z_PREFIX_SET
19
20/* all linked symbols */
21# define _dist_code z__dist_code
22# define _length_code z__length_code
23# define _tr_align z__tr_align
7
8#ifndef ZCONF_H
9#define ZCONF_H
10
11/*
12 * If you *really* need a unique prefix for all types and library functions,
13 * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
14 * Even better than compiling with -DZ_PREFIX would be to use configure to set
15 * this permanently in zconf.h using "./configure --zprefix".
16 */
17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18# define Z_PREFIX_SET
19
20/* all linked symbols */
21# define _dist_code z__dist_code
22# define _length_code z__length_code
23# define _tr_align z__tr_align
24# define _tr_flush_bits z__tr_flush_bits
24# define _tr_flush_block z__tr_flush_block
25# define _tr_init z__tr_init
26# define _tr_stored_block z__tr_stored_block
27# define _tr_tally z__tr_tally
28# define adler32 z_adler32
29# define adler32_combine z_adler32_combine
30# define adler32_combine64 z_adler32_combine64
31# ifndef Z_SOLO

--- 40 unchanged lines hidden (view full) ---

72# define gzoffset z_gzoffset
73# define gzoffset64 z_gzoffset64
74# define gzopen z_gzopen
75# define gzopen64 z_gzopen64
76# ifdef _WIN32
77# define gzopen_w z_gzopen_w
78# endif
79# define gzprintf z_gzprintf
25# define _tr_flush_block z__tr_flush_block
26# define _tr_init z__tr_init
27# define _tr_stored_block z__tr_stored_block
28# define _tr_tally z__tr_tally
29# define adler32 z_adler32
30# define adler32_combine z_adler32_combine
31# define adler32_combine64 z_adler32_combine64
32# ifndef Z_SOLO

--- 40 unchanged lines hidden (view full) ---

73# define gzoffset z_gzoffset
74# define gzoffset64 z_gzoffset64
75# define gzopen z_gzopen
76# define gzopen64 z_gzopen64
77# ifdef _WIN32
78# define gzopen_w z_gzopen_w
79# endif
80# define gzprintf z_gzprintf
81# define gzvprintf z_gzvprintf
80# define gzputc z_gzputc
81# define gzputs z_gzputs
82# define gzread z_gzread
83# define gzrewind z_gzrewind
84# define gzseek z_gzseek
85# define gzseek64 z_gzseek64
86# define gzsetparams z_gzsetparams
87# define gztell z_gztell

--- 10 unchanged lines hidden (view full) ---

98# define inflateGetHeader z_inflateGetHeader
99# define inflateInit2_ z_inflateInit2_
100# define inflateInit_ z_inflateInit_
101# define inflateMark z_inflateMark
102# define inflatePrime z_inflatePrime
103# define inflateReset z_inflateReset
104# define inflateReset2 z_inflateReset2
105# define inflateSetDictionary z_inflateSetDictionary
82# define gzputc z_gzputc
83# define gzputs z_gzputs
84# define gzread z_gzread
85# define gzrewind z_gzrewind
86# define gzseek z_gzseek
87# define gzseek64 z_gzseek64
88# define gzsetparams z_gzsetparams
89# define gztell z_gztell

--- 10 unchanged lines hidden (view full) ---

100# define inflateGetHeader z_inflateGetHeader
101# define inflateInit2_ z_inflateInit2_
102# define inflateInit_ z_inflateInit_
103# define inflateMark z_inflateMark
104# define inflatePrime z_inflatePrime
105# define inflateReset z_inflateReset
106# define inflateReset2 z_inflateReset2
107# define inflateSetDictionary z_inflateSetDictionary
108# define inflateGetDictionary z_inflateGetDictionary
106# define inflateSync z_inflateSync
107# define inflateSyncPoint z_inflateSyncPoint
108# define inflateUndermine z_inflateUndermine
109# define inflateResetKeep z_inflateResetKeep
110# define inflate_copyright z_inflate_copyright
111# define inflate_fast z_inflate_fast
112# define inflate_table z_inflate_table
113# ifndef Z_SOLO

--- 269 unchanged lines hidden (view full) ---

383 typedef void FAR *voidpf;
384 typedef void *voidp;
385#else
386 typedef Byte const *voidpc;
387 typedef Byte FAR *voidpf;
388 typedef Byte *voidp;
389#endif
390
109# define inflateSync z_inflateSync
110# define inflateSyncPoint z_inflateSyncPoint
111# define inflateUndermine z_inflateUndermine
112# define inflateResetKeep z_inflateResetKeep
113# define inflate_copyright z_inflate_copyright
114# define inflate_fast z_inflate_fast
115# define inflate_table z_inflate_table
116# ifndef Z_SOLO

--- 269 unchanged lines hidden (view full) ---

386 typedef void FAR *voidpf;
387 typedef void *voidp;
388#else
389 typedef Byte const *voidpc;
390 typedef Byte FAR *voidpf;
391 typedef Byte *voidp;
392#endif
393
391/* ./configure may #define Z_U4 here */
392
393#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
394# include <limits.h>
395# if (UINT_MAX == 0xffffffffUL)
396# define Z_U4 unsigned
394#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
395# include <limits.h>
396# if (UINT_MAX == 0xffffffffUL)
397# define Z_U4 unsigned
397# else
398# if (ULONG_MAX == 0xffffffffUL)
399# define Z_U4 unsigned long
400# else
401# if (USHRT_MAX == 0xffffffffUL)
402# define Z_U4 unsigned short
403# endif
404# endif
398# elif (ULONG_MAX == 0xffffffffUL)
399# define Z_U4 unsigned long
400# elif (USHRT_MAX == 0xffffffffUL)
401# define Z_U4 unsigned short
405# endif
406#endif
407
408#ifdef Z_U4
409 typedef Z_U4 z_crc_t;
410#else
411 typedef unsigned long z_crc_t;
412#endif

--- 7 unchanged lines hidden (view full) ---

420#endif
421
422#ifdef STDC
423# ifndef Z_SOLO
424# include <sys/types.h> /* for off_t */
425# endif
426#endif
427
402# endif
403#endif
404
405#ifdef Z_U4
406 typedef Z_U4 z_crc_t;
407#else
408 typedef unsigned long z_crc_t;
409#endif

--- 7 unchanged lines hidden (view full) ---

417#endif
418
419#ifdef STDC
420# ifndef Z_SOLO
421# include <sys/types.h> /* for off_t */
422# endif
423#endif
424
425#if defined(STDC) || defined(Z_HAVE_STDARG_H)
426# ifndef Z_SOLO
427# include <stdarg.h> /* for va_list */
428# endif
429#endif
430
428#ifdef _WIN32
431#ifdef _WIN32
429# include <stddef.h> /* for wchar_t */
432# ifndef Z_SOLO
433# include <stddef.h> /* for wchar_t */
434# endif
430#endif
431
432/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
433 * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
434 * though the former does not conform to the LFS document), but considering
435 * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
436 * equivalently requesting no 64-bit operations
437 */
435#endif
436
437/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
438 * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
439 * though the former does not conform to the LFS document), but considering
440 * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
441 * equivalently requesting no 64-bit operations
442 */
438#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
443#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
439# undef _LARGEFILE64_SOURCE
440#endif
441
442#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
443# define Z_HAVE_UNISTD_H
444#endif
445#ifndef Z_SOLO
444# undef _LARGEFILE64_SOURCE
445#endif
446
447#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
448# define Z_HAVE_UNISTD_H
449#endif
450#ifndef Z_SOLO
446# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
451# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
447# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
448# ifdef VMS
449# include <unixio.h> /* for off_t */
450# endif
451# ifndef z_off_t
452# define z_off_t off_t
453# endif
454# endif

--- 60 unchanged lines hidden ---
452# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
453# ifdef VMS
454# include <unixio.h> /* for off_t */
455# endif
456# ifndef z_off_t
457# define z_off_t off_t
458# endif
459# endif

--- 60 unchanged lines hidden ---