third_party/zlib/google.patch - Issue 1384773002: Fix VC++ 2015 64-bit truncation warning in zlib

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/zlib/google.patch

Issue 1384773002: Fix VC++ 2015 64-bit truncation warning in zlib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Simplify patch Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

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);

1 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c	13 diff -ru zlib-1.2.5/gzlib.c zlib/gzlib.c

2 --- zlib-1.2.5/gzlib.c	14 --- zlib-1.2.5/gzlib.c

3 +++ zlib/gzlib.c	15 +++ zlib/gzlib.c

4 @@ -5,7 +5,9 @@	16 @@ -5,7 +5,9 @@

5	17

6 #include "gzguts.h"	18 #include "gzguts.h"

7	19

8 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0	20 -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0

9 +#if defined(_WIN32)	21 +#if defined(_WIN32)

10 +# define LSEEK (z_off64_t)_lseeki64	22 +# define LSEEK (z_off64_t)_lseeki64

(...skipping 220 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
231 +# ifdef adler32_combine	243 +# ifdef adler32_combine

232 +# undef adler32_combine	244 +# undef adler32_combine

233 +# endif	245 +# endif

234 # define adler32_combine adler32_combine64	246 # define adler32_combine adler32_combine64

235 +# ifdef crc32_combine	247 +# ifdef crc32_combine

236 +# undef crc32_combine	248 +# undef crc32_combine

237 +# endif	249 +# endif

238 # define crc32_combine crc32_combine64	250 # define crc32_combine crc32_combine64

239 # ifdef _LARGEFILE64_SOURCE	251 # ifdef _LARGEFILE64_SOURCE

240 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char , const char ));	252 ZEXTERN gzFile ZEXPORT gzopen64 OF((const char , const char ));

OLD	NEW

« no previous file with comments | « third_party/zlib/crc_folding.c ('k') | no next file » | no next file with comments »