Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/zlib/files: zlib-1.2.5-lfs-decls.patch
Date: Sun, 25 Apr 2010 22:58:10
Message-Id: 20100425224111.BCE1B2C062@corvid.gentoo.org
1 flameeyes 10/04/25 22:41:11
2
3 Added: zlib-1.2.5-lfs-decls.patch
4 Log:
5 Revision bump, add patch from bug #316377.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch?rev=1.1&content-type=text/plain
13
14 Index: zlib-1.2.5-lfs-decls.patch
15 ===================================================================
16 diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h
17 --- zlib-1.2.5/zlib.h 2010-04-20 09:42:48.000000000 +0530
18 +++ zlib-1.2.5-new/zlib.h 2010-04-21 13:44:40.105742649 +0530
19 @@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
20 ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
21 #endif
22
23 -#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
24 +#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \
25 + _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE
26 # define gzopen gzopen64
27 # define gzseek gzseek64
28 # define gztell gztell64
29 # define gzoffset gzoffset64
30 # define adler32_combine adler32_combine64
31 # define crc32_combine crc32_combine64
32 -# ifdef _LARGEFILE64_SOURCE
33 - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
34 - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
35 - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
36 - ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
37 - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
38 - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
39 -# endif
40 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
41 + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
42 + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
43 + ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
44 + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
45 + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
46 #else
47 ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
48 ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));