third_party/zlib/google.patch - Issue 761903003: Update from https://crrev.com/306655

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 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years 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/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 (z_off64_t)_lseeki64

11 +#elif defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0	11 +#elif defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0

12 # define LSEEK lseek64	12 # define LSEEK lseek64

13 #else	13 #else

14 # define LSEEK lseek	14 # define LSEEK lseek

15 diff -ru zlib-1.2.5/mozzconf.h zlib/mozzconf.h	15 diff -ru zlib-1.2.5/mozzconf.h zlib/mozzconf.h

16 --- 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

17 +++ zlib/mozzconf.h 2011-12-16 16:08:00.000000000 +0800	17 +++ zlib/mozzconf.h 2011-12-16 16:08:00.000000000 +0800

18 @@ -0,0 +1,168 @@	18 @@ -0,0 +1,168 @@

19 +/* -- 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 -- */

20 +/* *** BEGIN LICENSE BLOCK ***	20 +/* *** BEGIN LICENSE BLOCK ***

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

232 +# undef adler32_combine	232 +# undef adler32_combine

233 +# endif	233 +# endif

234 # define adler32_combine adler32_combine64	234 # define adler32_combine adler32_combine64

235 +# ifdef crc32_combine	235 +# ifdef crc32_combine

236 +# undef crc32_combine	236 +# undef crc32_combine

237 +# endif	237 +# endif

238 # define crc32_combine crc32_combine64	238 # define crc32_combine crc32_combine64

239 # ifdef _LARGEFILE64_SOURCE	239 # ifdef _LARGEFILE64_SOURCE

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

OLD	NEW

« no previous file with comments | « third_party/zlib/BUILD.gn ('k') | third_party/zlib/google/zip_reader.cc » ('j') | no next file with comments »