third_party/protobuf/src/google/protobuf/stubs/atomicops.h - Issue 517273003: Cherry pick r573 from upstream protobuf

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/src/google/protobuf/stubs/atomicops.h

Issue 517273003: Cherry pick r573 from upstream protobuf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: third_party/protobuf/src/google/protobuf/stubs/atomicops.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops.h

index f389a36bf900512e1919941ea1220d87ed4e4211..ae3ba88e5fe09e80894381a8d882c7ec68e47486 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops.h

+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops.h

@@ -185,7 +185,7 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR

#include <google/protobuf/stubs/atomicops_internals_arm64_gcc.h>

#elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX)

#include <google/protobuf/stubs/atomicops_internals_arm_qnx.h>

-#elif defined(GOOGLE_PROTOBUF_ARCH_MIPS)

+#elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) || defined(GOOGLE_PROTOBUF_ARCH_MIPS64)

#include <google/protobuf/stubs/atomicops_internals_mips_gcc.h>

#elif defined(__pnacl__)

#include <google/protobuf/stubs/atomicops_internals_pnacl.h>