OLD | NEW |
1 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c | 1 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c |
2 --- zlib-1.2.5/gzlib.c | 2 --- zlib-1.2.5/gzlib.c |
3 +++ zlib/gzlib.c | 3 +++ zlib/gzlib.c |
4 @@ -5,7 +5,9 @@ | 4 @@ -5,7 +5,9 @@ |
5 | 5 |
6 #include "gzguts.h" | 6 #include "gzguts.h" |
7 | 7 |
8 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 | 8 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 |
9 +#if defined(_WIN32) | 9 +#if defined(_WIN32) |
10 +# define LSEEK _lseeki64 | 10 +# define LSEEK _lseeki64 |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 @@ -359,7 +359,7 @@ typedef uLong FAR uLongf; | 200 @@ -359,7 +359,7 @@ typedef uLong FAR uLongf; |
201 typedef Byte *voidp; | 201 typedef Byte *voidp; |
202 #endif | 202 #endif |
203 | 203 |
204 -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ | 204 -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ |
205 +#if !defined(_WIN32) | 205 +#if !defined(_WIN32) |
206 # define Z_HAVE_UNISTD_H | 206 # define Z_HAVE_UNISTD_H |
207 #endif | 207 #endif |
208 | 208 |
209 --- zlib-1.2.5/zlib.h 2010-04-20 12:12:48.000000000 +0800 | 209 --- zlib-1.2.5/zlib.h 2010-04-20 12:12:48.000000000 +0800 |
210 +++ zlib/zlib.h»2011-12-16 16:08:48.000000000 +0800 | 210 +++ zlib/zlib.h»2013-04-06 16:08:48.000000000 +0800 |
211 @@ -1572,12 +1572,14 @@ | 211 @@ -1572,11 +1572,29 @@ |
212 #endif | 212 #endif |
213 | 213 |
214 #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 | 214 #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 |
215 -# define gzopen gzopen64 | 215 +# ifdef gzopen |
216 -# define gzseek gzseek64 | 216 +# undef gzopen |
217 -# define gztell gztell64 | |
218 -# define gzoffset gzoffset64 | |
219 -# define adler32_combine adler32_combine64 | |
220 -# define crc32_combine crc32_combine64 | |
221 +# if !defined(MOZZCONF_H) | |
222 +# define gzopen gzopen64 | |
223 +# define gzseek gzseek64 | |
224 +# define gztell gztell64 | |
225 +# define gzoffset gzoffset64 | |
226 +# define adler32_combine adler32_combine64 | |
227 +# define crc32_combine crc32_combine64 | |
228 +# endif | 217 +# endif |
| 218 # define gzopen gzopen64 |
| 219 +# ifdef gzseek |
| 220 +# undef gzseek |
| 221 +# endif |
| 222 # define gzseek gzseek64 |
| 223 +# ifdef gztell |
| 224 +# undef gztell |
| 225 +# endif |
| 226 # define gztell gztell64 |
| 227 +# ifdef gzoffset |
| 228 +# undef gzoffset |
| 229 +# endif |
| 230 # define gzoffset gzoffset64 |
| 231 +# ifdef adler32_combine |
| 232 +# undef adler32_combine |
| 233 +# endif |
| 234 # define adler32_combine adler32_combine64 |
| 235 +# ifdef crc32_combine |
| 236 +# undef crc32_combine |
| 237 +# endif |
| 238 # define crc32_combine crc32_combine64 |
229 # ifdef _LARGEFILE64_SOURCE | 239 # ifdef _LARGEFILE64_SOURCE |
230 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); | 240 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); |
231 ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); | |
OLD | NEW |