diff options
Diffstat (limited to 'cpukit/zlib/zconf.h')
| -rw-r--r-- | cpukit/zlib/zconf.h | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/cpukit/zlib/zconf.h b/cpukit/zlib/zconf.h index 02ce56c431..ea61b5cf2f 100644 --- a/cpukit/zlib/zconf.h +++ b/cpukit/zlib/zconf.h @@ -14,7 +14,7 @@ * 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 /* may be set to #if 1 by ./configure */ +#if 1 /* was set to #if 1 by ./configure */ /* all linked symbols */ # define _dist_code z__dist_code @@ -315,6 +315,10 @@ # endif #endif +#ifdef HAVE_VISIBILITY_PRAGMA +# define ZEXTERN __attribute__((visibility ("default"))) extern +#endif + #ifndef ZEXTERN # define ZEXTERN extern #endif @@ -356,25 +360,12 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +#if 1 /* was set to #if 1 by ./configure */ # define Z_HAVE_UNISTD_H #endif -#ifdef STDC +#ifdef Z_HAVE_UNISTD_H # 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 */ @@ -384,22 +375,19 @@ 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 |