summaryrefslogtreecommitdiffstats
path: root/lib/libz
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2010-04-01 21:21:45 +0000
committerdelphij <delphij@FreeBSD.org>2010-04-01 21:21:45 +0000
commit8da4807e95a3d30a65da9ad66f6b3fecca56fb8d (patch)
tree5a9d0cc4f54e5d12a267ff3fb02d69db0d5a91d6 /lib/libz
parentce9748d41dc7fc136609d648c9695feef4f10c44 (diff)
downloadFreeBSD-src-8da4807e95a3d30a65da9ad66f6b3fecca56fb8d.zip
FreeBSD-src-8da4807e95a3d30a65da9ad66f6b3fecca56fb8d.tar.gz
For now, hardcode FreeBSD configuration that will never change on zlib.h:
unifdef -D_FILE_OFFSET_BITS=64 -U_LFS64_LARGEFILE -U_LARGEFILE64_SOURCE
Diffstat (limited to 'lib/libz')
-rw-r--r--lib/libz/zlib.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/lib/libz/zlib.h b/lib/libz/zlib.h
index 1fcf630..c494aee 100644
--- a/lib/libz/zlib.h
+++ b/lib/libz/zlib.h
@@ -1556,38 +1556,13 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
inflateBackInit_((strm), (windowBits), (window), \
ZLIB_VERSION, sizeof(z_stream))
-#if _LARGEFILE64_SOURCE == 1 && _LFS64_LARGEFILE == 1
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int));
- ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile));
- ZEXTERN off64_t ZEXPORT gzoffset64 OF((gzFile));
- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t));
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t));
-#endif
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS == 64 && _LFS64_LARGEFILE == 1
-# define gzopen gzopen64
-# define gzseek gzseek64
-# define gztell gztell64
-# define gzoffset gzoffset64
-# define adler32_combine adler32_combine64
-# define crc32_combine crc32_combine64
-# if _LARGEFILE64_SOURCE != 1
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN off_t ZEXPORT gzseek64 OF((gzFile, off_t, int));
- ZEXTERN off_t ZEXPORT gztell64 OF((gzFile));
- ZEXTERN off_t ZEXPORT gzoffset64 OF((gzFile));
- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off_t));
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off_t));
-# endif
-#else
ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
struct internal_state {int dummy;}; /* hack for buggy compilers */
OpenPOWER on IntegriCloud