diff options
author | delphij <delphij@FreeBSD.org> | 2010-04-16 20:04:45 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2010-04-16 20:04:45 +0000 |
commit | 60d1ae7ed970f76115097c85c1a42c45b8ac3698 (patch) | |
tree | d4aeb3437b6fd68a21673e92ad09d1c1bc3ba595 /lib/libz/zconf.h | |
parent | ce27b0428a5cc7c02cf71493bc42f41946660a0f (diff) | |
download | FreeBSD-src-60d1ae7ed970f76115097c85c1a42c45b8ac3698.zip FreeBSD-src-60d1ae7ed970f76115097c85c1a42c45b8ac3698.tar.gz |
MFV: libz 1.2.4.3.
Diffstat (limited to 'lib/libz/zconf.h')
-rw-r--r-- | lib/libz/zconf.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h index b2ac21e..98cbe66 100644 --- a/lib/libz/zconf.h +++ b/lib/libz/zconf.h @@ -364,8 +364,11 @@ typedef uLong FAR uLongf; # define Z_HAVE_UNISTD_H #endif -#if defined(Z_HAVE_UNISTD_H) +#ifdef STDC # include <sys/types.h> /* for off_t */ +#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,7 +387,6 @@ typedef uLong FAR uLongf; /* * This is hard-configured for FreeBSD. */ -#include <sys/types.h> #define z_off_t off_t #ifndef _FILE_OFFSET_BITS #define _FILE_OFFSET_BITS 64 @@ -394,6 +396,12 @@ typedef uLong FAR uLongf; # 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 |