diff options
| author | nijtmans <nijtmans> | 2010-04-20 14:50:10 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-04-20 14:50:10 (GMT) |
| commit | 833ea84043d927c416802983797aa3884a894012 (patch) | |
| tree | 92c8f9663c828bd3eb7d42c72b7b54841ed193ab /compat/zlib/zconf.h.cmakein | |
| parent | 04890d3f2b3093debd335e9bea71a39c99a9fa5e (diff) | |
| download | tcl-833ea84043d927c416802983797aa3884a894012.zip tcl-833ea84043d927c416802983797aa3884a894012.tar.gz tcl-833ea84043d927c416802983797aa3884a894012.tar.bz2 | |
Upgrade to zlib 1.2.5
Diffstat (limited to 'compat/zlib/zconf.h.cmakein')
| -rw-r--r-- | compat/zlib/zconf.h.cmakein | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/compat/zlib/zconf.h.cmakein b/compat/zlib/zconf.h.cmakein index b659568..9e69b1b 100644 --- a/compat/zlib/zconf.h.cmakein +++ b/compat/zlib/zconf.h.cmakein @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zconf.h.cmakein,v 1.1 2010/03/16 09:01:03 nijtmans Exp $ */ +/* @(#) $Id: zconf.h.cmakein,v 1.2 2010/04/20 14:50:10 nijtmans Exp $ */ #ifndef ZCONF_H #define ZCONF_H @@ -317,10 +317,6 @@ # endif #endif -#ifdef HAVE_VISIBILITY_PRAGMA -# define ZEXTERN __attribute__((visibility ("default"))) extern -#endif - #ifndef ZEXTERN # define ZEXTERN extern #endif @@ -366,8 +362,21 @@ typedef uLong FAR uLongf; # define Z_HAVE_UNISTD_H #endif -#ifdef Z_HAVE_UNISTD_H +#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 */ @@ -377,19 +386,22 @@ typedef uLong FAR uLongf; # endif #endif -#ifdef _LARGEFILE64_SOURCE -# include <sys/types.h> -#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 |