| OLD | NEW |
| 1 diff -ru zlib-1.2.5/crc_folding.c zlib/crc_folding.c | |
| 2 --- zlib-1.2.5/crc_folding.c | |
| 3 +++ zlib/crc_folding.c | |
| 4 @@ -283,7 +283,7 @@ | |
| 5 goto partial; | |
| 6 } | |
| 7 | |
| 8 - algn_diff = 0 - (unsigned long)src & 0xF; | |
| 9 + algn_diff = 0 - (uintptr_t)src & 0xF; | |
| 10 if (algn_diff) { | |
| 11 xmm_crc_part = _mm_loadu_si128((__m128i *)src); | |
| 12 _mm_storeu_si128((__m128i *)dst, xmm_crc_part); | |
| 13 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c | 1 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c |
| 14 --- zlib-1.2.5/gzlib.c | 2 --- zlib-1.2.5/gzlib.c |
| 15 +++ zlib/gzlib.c | 3 +++ zlib/gzlib.c |
| 16 @@ -5,7 +5,9 @@ | 4 @@ -5,7 +5,9 @@ |
| 17 | 5 |
| 18 #include "gzguts.h" | 6 #include "gzguts.h" |
| 19 | 7 |
| 20 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 | 8 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 |
| 21 +#if defined(_WIN32) | 9 +#if defined(_WIN32) |
| 22 +# define LSEEK (z_off64_t)_lseeki64 | 10 +# define LSEEK (z_off64_t)_lseeki64 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 +# ifdef adler32_combine | 231 +# ifdef adler32_combine |
| 244 +# undef adler32_combine | 232 +# undef adler32_combine |
| 245 +# endif | 233 +# endif |
| 246 # define adler32_combine adler32_combine64 | 234 # define adler32_combine adler32_combine64 |
| 247 +# ifdef crc32_combine | 235 +# ifdef crc32_combine |
| 248 +# undef crc32_combine | 236 +# undef crc32_combine |
| 249 +# endif | 237 +# endif |
| 250 # define crc32_combine crc32_combine64 | 238 # define crc32_combine crc32_combine64 |
| 251 # ifdef _LARGEFILE64_SOURCE | 239 # ifdef _LARGEFILE64_SOURCE |
| 252 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); | 240 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); |
| OLD | NEW |