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

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/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, 7 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 side-by-side diff with in-line comments

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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/patches/0005-fix-no-threadlocal-on-mac.patch

diff --git a/third_party/protobuf/patches/0005-fix-no-threadlocal-on-mac.patch b/third_party/protobuf/patches/0005-fix-no-threadlocal-on-mac.patch

deleted file mode 100644

index 2e68f7d13022fef2c4a0e50fa026b3d8b66f3e58..0000000000000000000000000000000000000000

--- a/third_party/protobuf/patches/0005-fix-no-threadlocal-on-mac.patch

+++ /dev/null

@@ -1,16 +0,0 @@

---- protobuf-cleaned/src/google/protobuf/stubs/platform_macros.h 2015-12-30 13:21:46.000000000 -0800

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

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

- #undef GOOGLE_PROTOBUF_PLATFORM_ERROR

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

-+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE)

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

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

- // TLS support on android.

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

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

- #define GOOGLE_PROTOBUF_NO_THREADLOCAL

- #endif