third_party/zlib/zutil.h - Issue 706203003: Update from https://crrev.com/303153

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

Unified Diff: third_party/zlib/zutil.h

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

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

Jump to:

Index: third_party/zlib/zutil.h

diff --git a/third_party/zlib/zutil.h b/third_party/zlib/zutil.h

index 39cf37304767e7236d30d8e89d489648d238a73b..3c8326f5ec257c06115b3ee97df970e9ec550390 100644

--- a/third_party/zlib/zutil.h

+++ b/third_party/zlib/zutil.h

@@ -142,6 +142,12 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */

# define OS_CODE 0x0a

#endif

+#ifdef _MSC_VER

+#define zalign(x) __declspec(align(x))

+#else

+#define zalign(x) __attribute__((aligned((x))))

+#endif

#ifdef WIN32

# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */

# define OS_CODE 0x0b

« no previous file with comments | « third_party/zlib/zlib.gyp ('k') | tools/clang/scripts/update.py » ('j') | no next file with comments »