OLD | NEW |
| 1 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c |
| 2 --- zlib-1.2.5/gzlib.c |
| 3 +++ zlib/gzlib.c |
| 4 @@ -5,7 +5,9 @@ |
| 5 |
| 6 #include "gzguts.h" |
| 7 |
| 8 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 |
| 9 +#if defined(_WIN32) |
| 10 +# define LSEEK _lseeki64 |
| 11 +#elif defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 |
| 12 # define LSEEK lseek64 |
| 13 #else |
| 14 # define LSEEK lseek |
1 diff -ru zlib-1.2.5/mozzconf.h zlib/mozzconf.h | 15 diff -ru zlib-1.2.5/mozzconf.h zlib/mozzconf.h |
2 --- zlib-1.2.5/mozzconf.h 2011-12-15 18:10:49.000000000 +0800 | 16 --- zlib-1.2.5/mozzconf.h 2011-12-15 18:10:49.000000000 +0800 |
3 +++ zlib/mozzconf.h 2011-12-16 16:08:00.000000000 +0800 | 17 +++ zlib/mozzconf.h 2011-12-16 16:08:00.000000000 +0800 |
4 @@ -0,0 +1,168 @@ | 18 @@ -0,0 +1,168 @@ |
5 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | 19 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
6 +/* ***** BEGIN LICENSE BLOCK ***** | 20 +/* ***** BEGIN LICENSE BLOCK ***** |
7 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 21 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
8 + * | 22 + * |
9 + * The contents of this file are subject to the Mozilla Public License Version | 23 + * The contents of this file are subject to the Mozilla Public License Version |
10 + * 1.1 (the "License"); you may not use this file except in compliance with | 24 + * 1.1 (the "License"); you may not use this file except in compliance with |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 @@ -8,6 +8,9 @@ | 190 @@ -8,6 +8,9 @@ |
177 #ifndef ZCONF_H | 191 #ifndef ZCONF_H |
178 #define ZCONF_H | 192 #define ZCONF_H |
179 | 193 |
180 +/* This include does prefixing as below, but with an updated set of names */ | 194 +/* This include does prefixing as below, but with an updated set of names */ |
181 +#include "mozzconf.h" | 195 +#include "mozzconf.h" |
182 + | 196 + |
183 /* | 197 /* |
184 * If you *really* need a unique prefix for all types and library functions, | 198 * If you *really* need a unique prefix for all types and library functions, |
185 * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. | 199 * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. |
186 diff -ru zlib-1.2.5/zlib.h zlib/zlib.h | 200 @@ -359,7 +359,7 @@ typedef uLong FAR uLongf; |
| 201 typedef Byte *voidp; |
| 202 #endif |
| 203 |
| 204 -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ |
| 205 +#if !defined(_WIN32) |
| 206 # define Z_HAVE_UNISTD_H |
| 207 #endif |
| 208 |
187 --- 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 |
188 +++ zlib/zlib.h 2011-12-16 16:08:48.000000000 +0800 | 210 +++ zlib/zlib.h 2011-12-16 16:08:48.000000000 +0800 |
189 @@ -1572,12 +1572,14 @@ | 211 @@ -1572,12 +1572,14 @@ |
190 #endif | 212 #endif |
191 | 213 |
192 #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 |
193 -# define gzopen gzopen64 | 215 -# define gzopen gzopen64 |
194 -# define gzseek gzseek64 | 216 -# define gzseek gzseek64 |
195 -# define gztell gztell64 | 217 -# define gztell gztell64 |
196 -# define gzoffset gzoffset64 | 218 -# define gzoffset gzoffset64 |
197 -# define adler32_combine adler32_combine64 | 219 -# define adler32_combine adler32_combine64 |
198 -# define crc32_combine crc32_combine64 | 220 -# define crc32_combine crc32_combine64 |
199 +# if !defined(MOZZCONF_H) | 221 +# if !defined(MOZZCONF_H) |
200 +# define gzopen gzopen64 | 222 +# define gzopen gzopen64 |
201 +# define gzseek gzseek64 | 223 +# define gzseek gzseek64 |
202 +# define gztell gztell64 | 224 +# define gztell gztell64 |
203 +# define gzoffset gzoffset64 | 225 +# define gzoffset gzoffset64 |
204 +# define adler32_combine adler32_combine64 | 226 +# define adler32_combine adler32_combine64 |
205 +# define crc32_combine crc32_combine64 | 227 +# define crc32_combine crc32_combine64 |
206 +# endif | 228 +# endif |
207 # ifdef _LARGEFILE64_SOURCE | 229 # ifdef _LARGEFILE64_SOURCE |
208 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); | 230 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); |
209 ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); | 231 ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); |
OLD | NEW |