third_party/protobuf/patches/0005-fix-no-threadlocal-on-mac.patch - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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/protobuf/patches/0005-fix-no-threadlocal-on-mac.patch

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 6 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

« no previous file with comments | « third_party/protobuf/patches/0005-fix-include-js-generator.patch ('k') | third_party/protobuf/patches/0006-fix-clang-type-errors.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 --- protobuf-cleaned/src/google/protobuf/stubs/platform_macros.h 2015-12- 30 13:21:46.000000000 -0800

2 +++ protobuf-patched/src/google/protobuf/stubs/platform_macros.h 2016-03- 31 13:25:38.960009002 -0700

3 @@ -111,11 +111,11 @@

4

5 #undef GOOGLE_PROTOBUF_PLATFORM_ERROR

6

7 -#if defined(GOOGLE_PROTOBUF_OS_ANDROID) \|\| defined(GOOGLE_PROTOBUF_OS_IPHONE)

8 +#if defined(GOOGLE_PROTOBUF_OS_ANDROID) \|\| defined(GOOGLE_PROTOBUF_OS_APPLE)

9 // Android ndk does not support the __thread keyword very well yet. Here

10 // we use pthread_key_create()/pthread_getspecific()/... methods for

11 // TLS support on android.

12 -// iOS also does not support the __thread keyword.

13 +// Apple Clang also does not support the __thread keyword.

14 #define GOOGLE_PROTOBUF_NO_THREADLOCAL

15 #endif

16

OLD	NEW