35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
|
diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h
|
||
|
|
--- zlib-1.2.5/zlib.h 2010-04-20 09:42:48.000000000 +0530
|
||
|
|
+++ zlib-1.2.5-new/zlib.h 2010-04-21 13:44:40.105742649 +0530
|
||
|
|
@@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
|
||
|
|
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
|
||
|
|
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \
|
||
|
|
+ _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE
|
||
|
|
# define gzopen gzopen64
|
||
|
|
# define gzseek gzseek64
|
||
|
|
# define gztell gztell64
|
||
|
|
# define gzoffset gzoffset64
|
||
|
|
# define adler32_combine adler32_combine64
|
||
|
|
# define crc32_combine crc32_combine64
|
||
|
|
-# ifdef _LARGEFILE64_SOURCE
|
||
|
|
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
|
||
|
|
- ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
|
||
|
|
- ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
|
||
|
|
- ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
|
||
|
|
- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
|
||
|
|
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
|
||
|
|
-# endif
|
||
|
|
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
|
||
|
|
+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
|
||
|
|
+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
|
||
|
|
+ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
|
||
|
|
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
|
||
|
|
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
|
||
|
|
#else
|
||
|
|
ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
|
||
|
|
ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
|
||
|
|
|