diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-03-14 10:30:41 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-03-14 10:30:41 -0700 |
| commit | 50a1738fcb0e5d1e84275cfe3a052c5e32449b84 (patch) | |
| tree | 85a53deff82c0748164c525735e44ce6279377f0 /zconf.h.cmakein | |
| parent | b18595d4c6925e97ec2c0a9e49230c189ce8fe64 (diff) | |
| download | zlib-50a1738fcb0e5d1e84275cfe3a052c5e32449b84.tar.gz | |
Make sure that unistd.h is included before using _LFS64_LARGEFILE.
Diffstat (limited to 'zconf.h.cmakein')
| -rw-r--r-- | zconf.h.cmakein | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index c08d177..81a7b7a 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -411,6 +411,21 @@ typedef uLong FAR uLongf; # 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 @@ -423,19 +438,6 @@ typedef uLong FAR uLongf; # define Z_WANT64 #endif -#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) -# define Z_HAVE_UNISTD_H -#endif -#if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE64)) && !defined(Z_SOLO) -# include <unistd.h> /* for SEEK_* and off_t */ -# ifdef VMS -# include <unixio.h> /* for off_t */ -# endif -# ifndef z_off_t -# define z_off_t off_t -# endif -#endif - #if !defined(SEEK_SET) && !defined(Z_SOLO) # define SEEK_SET 0 /* Seek from beginning of file. */ # define SEEK_CUR 1 /* Seek from current position. */ @@ -446,7 +448,7 @@ typedef uLong FAR uLongf; # define z_off_t long #endif -#if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0) +#if !defined(_WIN32) && defined(Z_LARGE64) # define z_off64_t off64_t #else # if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) |