]>
Commit | Line | Data |
---|---|---|
c247493c JB |
1 | Improper condition was introduced in 1.2.5 causing some applications |
2 | (e.g. cgit) to fail due to conflicting declarations. | |
3 | ||
4 | References: | |
5 | - http://mail.madler.net/pipermail/zlib-devel_madler.net/2010-May/002249.html | |
6 | - http://bugs.debian.org/439980 | |
7 | - http://bugs.gentoo.org/show_bug.cgi?id=316377 | |
8 | - http://bugs.gentoo.org/show_bug.cgi?id=316855 | |
9 | - http://bugs.archlinux.org/task/19280 | |
10 | - https://bugs.launchpad.net/ubuntu/+source/libpciaccess/+bug/402178 | |
11 | ||
12 | --- zlib-1.2.5/zlib.h.orig 2010-04-20 06:12:48.000000000 +0200 | |
13 | +++ zlib-1.2.5/zlib.h 2010-05-24 21:28:52.465538337 +0200 | |
14 | @@ -1562,7 +1562,7 @@ | |
15 | * functions are changed to 64 bits) -- in case these are set on systems | |
16 | * without large file support, _LFS64_LARGEFILE must also be true | |
17 | */ | |
18 | -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 | |
19 | +#if (defined(_LARGEFILE64_SOURCE) || (_FILE_OFFSET_BITS-0 == 64)) && _LFS64_LARGEFILE-0 | |
20 | ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); | |
21 | ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); | |
22 | ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); | |
23 | @@ -1578,14 +1578,6 @@ | |
24 | # define gzoffset gzoffset64 | |
25 | # define adler32_combine adler32_combine64 | |
26 | # define crc32_combine crc32_combine64 | |
27 | -# ifdef _LARGEFILE64_SOURCE | |
28 | - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); | |
29 | - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); | |
30 | - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); | |
31 | - ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); | |
32 | - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); | |
33 | - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); | |
34 | -# endif | |
35 | #else | |
36 | ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); | |
37 | ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); |