aboutsummaryrefslogtreecommitdiff
path: root/zconf.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--zconf.h22
-rw-r--r--zconf.h.cmakein22
-rw-r--r--zconf.h.in22
3 files changed, 60 insertions, 6 deletions
diff --git a/zconf.h b/zconf.h
index 02ce56c..1c06556 100644
--- a/zconf.h
+++ b/zconf.h
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2010 Jean-loup Gailly. 2 * Copyright (C) 1995-2011 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
@@ -15,6 +15,7 @@
15 * this permanently in zconf.h using "./configure --zprefix". 15 * this permanently in zconf.h using "./configure --zprefix".
16 */ 16 */
17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ 17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18# define Z_PREFIX_SET
18 19
19/* all linked symbols */ 20/* all linked symbols */
20# define _dist_code z__dist_code 21# define _dist_code z__dist_code
@@ -40,6 +41,7 @@
40# define deflateInit2_ z_deflateInit2_ 41# define deflateInit2_ z_deflateInit2_
41# define deflateInit_ z_deflateInit_ 42# define deflateInit_ z_deflateInit_
42# define deflateParams z_deflateParams 43# define deflateParams z_deflateParams
44# define deflatePending z_deflatePending
43# define deflatePrime z_deflatePrime 45# define deflatePrime z_deflatePrime
44# define deflateReset z_deflateReset 46# define deflateReset z_deflateReset
45# define deflateSetDictionary z_deflateSetDictionary 47# define deflateSetDictionary z_deflateSetDictionary
@@ -243,6 +245,14 @@
243# endif 245# endif
244#endif 246#endif
245 247
248#ifndef ON /* function prototypes for stdarg */
249# if defined(STDC) || defined(Z_HAVE_STDARG_H)
250# define ON(args) args
251# else
252# define ON(args) ()
253# endif
254#endif
255
246/* The following definitions for FAR are needed only for MSDOS mixed 256/* The following definitions for FAR are needed only for MSDOS mixed
247 * model programming (small or medium model with some far allocations). 257 * model programming (small or medium model with some far allocations).
248 * This was tested only with MSC; for other MSDOS compilers you may have 258 * This was tested only with MSC; for other MSDOS compilers you may have
@@ -360,6 +370,10 @@ typedef uLong FAR uLongf;
360# define Z_HAVE_UNISTD_H 370# define Z_HAVE_UNISTD_H
361#endif 371#endif
362 372
373#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
374# define Z_HAVE_STDARG_H
375#endif
376
363#ifdef STDC 377#ifdef STDC
364# include <sys/types.h> /* for off_t */ 378# include <sys/types.h> /* for off_t */
365#endif 379#endif
@@ -374,7 +388,11 @@ typedef uLong FAR uLongf;
374# undef _LARGEFILE64_SOURCE 388# undef _LARGEFILE64_SOURCE
375#endif 389#endif
376 390
377#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) 391#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
392# define Z_LARGE
393#endif
394
395#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
378# include <unistd.h> /* for SEEK_* and off_t */ 396# include <unistd.h> /* for SEEK_* and off_t */
379# ifdef VMS 397# ifdef VMS
380# include <unixio.h> /* for off_t */ 398# include <unixio.h> /* for off_t */
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index a2f71b1..4a5d9ea 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2010 Jean-loup Gailly. 2 * Copyright (C) 1995-2011 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
@@ -17,6 +17,7 @@
17 * this permanently in zconf.h using "./configure --zprefix". 17 * this permanently in zconf.h using "./configure --zprefix".
18 */ 18 */
19#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ 19#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
20# define Z_PREFIX_SET
20 21
21/* all linked symbols */ 22/* all linked symbols */
22# define _dist_code z__dist_code 23# define _dist_code z__dist_code
@@ -42,6 +43,7 @@
42# define deflateInit2_ z_deflateInit2_ 43# define deflateInit2_ z_deflateInit2_
43# define deflateInit_ z_deflateInit_ 44# define deflateInit_ z_deflateInit_
44# define deflateParams z_deflateParams 45# define deflateParams z_deflateParams
46# define deflatePending z_deflatePending
45# define deflatePrime z_deflatePrime 47# define deflatePrime z_deflatePrime
46# define deflateReset z_deflateReset 48# define deflateReset z_deflateReset
47# define deflateSetDictionary z_deflateSetDictionary 49# define deflateSetDictionary z_deflateSetDictionary
@@ -245,6 +247,14 @@
245# endif 247# endif
246#endif 248#endif
247 249
250#ifndef ON /* function prototypes for stdarg */
251# if defined(STDC) || defined(Z_HAVE_STDARG_H)
252# define ON(args) args
253# else
254# define ON(args) ()
255# endif
256#endif
257
248/* The following definitions for FAR are needed only for MSDOS mixed 258/* The following definitions for FAR are needed only for MSDOS mixed
249 * model programming (small or medium model with some far allocations). 259 * model programming (small or medium model with some far allocations).
250 * This was tested only with MSC; for other MSDOS compilers you may have 260 * This was tested only with MSC; for other MSDOS compilers you may have
@@ -362,6 +372,10 @@ typedef uLong FAR uLongf;
362# define Z_HAVE_UNISTD_H 372# define Z_HAVE_UNISTD_H
363#endif 373#endif
364 374
375#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
376# define Z_HAVE_STDARG_H
377#endif
378
365#ifdef STDC 379#ifdef STDC
366# include <sys/types.h> /* for off_t */ 380# include <sys/types.h> /* for off_t */
367#endif 381#endif
@@ -376,7 +390,11 @@ typedef uLong FAR uLongf;
376# undef _LARGEFILE64_SOURCE 390# undef _LARGEFILE64_SOURCE
377#endif 391#endif
378 392
379#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) 393#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
394# define Z_LARGE
395#endif
396
397#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
380# include <unistd.h> /* for SEEK_* and off_t */ 398# include <unistd.h> /* for SEEK_* and off_t */
381# ifdef VMS 399# ifdef VMS
382# include <unixio.h> /* for off_t */ 400# include <unixio.h> /* for off_t */
diff --git a/zconf.h.in b/zconf.h.in
index 02ce56c..1c06556 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2010 Jean-loup Gailly. 2 * Copyright (C) 1995-2011 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
@@ -15,6 +15,7 @@
15 * this permanently in zconf.h using "./configure --zprefix". 15 * this permanently in zconf.h using "./configure --zprefix".
16 */ 16 */
17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ 17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18# define Z_PREFIX_SET
18 19
19/* all linked symbols */ 20/* all linked symbols */
20# define _dist_code z__dist_code 21# define _dist_code z__dist_code
@@ -40,6 +41,7 @@
40# define deflateInit2_ z_deflateInit2_ 41# define deflateInit2_ z_deflateInit2_
41# define deflateInit_ z_deflateInit_ 42# define deflateInit_ z_deflateInit_
42# define deflateParams z_deflateParams 43# define deflateParams z_deflateParams
44# define deflatePending z_deflatePending
43# define deflatePrime z_deflatePrime 45# define deflatePrime z_deflatePrime
44# define deflateReset z_deflateReset 46# define deflateReset z_deflateReset
45# define deflateSetDictionary z_deflateSetDictionary 47# define deflateSetDictionary z_deflateSetDictionary
@@ -243,6 +245,14 @@
243# endif 245# endif
244#endif 246#endif
245 247
248#ifndef ON /* function prototypes for stdarg */
249# if defined(STDC) || defined(Z_HAVE_STDARG_H)
250# define ON(args) args
251# else
252# define ON(args) ()
253# endif
254#endif
255
246/* The following definitions for FAR are needed only for MSDOS mixed 256/* The following definitions for FAR are needed only for MSDOS mixed
247 * model programming (small or medium model with some far allocations). 257 * model programming (small or medium model with some far allocations).
248 * This was tested only with MSC; for other MSDOS compilers you may have 258 * This was tested only with MSC; for other MSDOS compilers you may have
@@ -360,6 +370,10 @@ typedef uLong FAR uLongf;
360# define Z_HAVE_UNISTD_H 370# define Z_HAVE_UNISTD_H
361#endif 371#endif
362 372
373#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
374# define Z_HAVE_STDARG_H
375#endif
376
363#ifdef STDC 377#ifdef STDC
364# include <sys/types.h> /* for off_t */ 378# include <sys/types.h> /* for off_t */
365#endif 379#endif
@@ -374,7 +388,11 @@ typedef uLong FAR uLongf;
374# undef _LARGEFILE64_SOURCE 388# undef _LARGEFILE64_SOURCE
375#endif 389#endif
376 390
377#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) 391#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
392# define Z_LARGE
393#endif
394
395#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
378# include <unistd.h> /* for SEEK_* and off_t */ 396# include <unistd.h> /* for SEEK_* and off_t */
379# ifdef VMS 397# ifdef VMS
380# include <unixio.h> /* for off_t */ 398# include <unixio.h> /* for off_t */