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

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/src/google/protobuf/stubs/mathutil.h ('k') | third_party/protobuf/src/google/protobuf/stubs/port.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 580263e72e260bc6a60f874cf47d7fae30bbddfc..4ba4b348c74fcc37cdd5b67e963c654909788ea7 100644

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

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

@@ -65,7 +65,7 @@

#define GOOGLE_PROTOBUF_ARCH_32_BIT 1

#elif defined(sparc)

#define GOOGLE_PROTOBUF_ARCH_SPARC 1

-#ifdef SOLARIS_64BIT_ENABLED

+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)

#define GOOGLE_PROTOBUF_ARCH_64_BIT 1

#else

#define GOOGLE_PROTOBUF_ARCH_32_BIT 1

@@ -73,6 +73,9 @@

#elif defined(_POWER) || defined(__powerpc64__) || defined(__PPC64__)

#define GOOGLE_PROTOBUF_ARCH_POWER 1

#define GOOGLE_PROTOBUF_ARCH_64_BIT 1

+#elif defined(__PPC__)

+#define GOOGLE_PROTOBUF_ARCH_PPC 1

+#define GOOGLE_PROTOBUF_ARCH_32_BIT 1

#elif defined(__GNUC__)

# if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))

// We fallback to the generic Clang/GCC >= 4.7 implementation in atomicops.h

@@ -111,11 +114,11 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR

#undef GOOGLE_PROTOBUF_PLATFORM_ERROR

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

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

// 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.

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

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

#define GOOGLE_PROTOBUF_NO_THREADLOCAL

#endif

« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/mathutil.h ('k') | third_party/protobuf/src/google/protobuf/stubs/port.h » ('j') | no next file with comments »