diff options
| author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-19 02:37:59 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-19 02:37:59 +0000 |
| commit | 728aa760fdb0e0ddfe1f6a6c0f48a5d625189c8d (patch) | |
| tree | a87804bf9914f549f4abb7157676e70e629f52fc | |
| parent | 0b30eb8c87a42ec63d41b943f9536bb94fc3c35b (diff) | |
| download | protobuf-728aa760fdb0e0ddfe1f6a6c0f48a5d625189c8d.tar.gz protobuf-728aa760fdb0e0ddfe1f6a6c0f48a5d625189c8d.tar.bz2 protobuf-728aa760fdb0e0ddfe1f6a6c0f48a5d625189c8d.zip | |
Down-integrate form internal opensource branch
| -rw-r--r-- | src/google/protobuf/descriptor.h | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.cc | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h index 9e157798..33e3af72 100644 --- a/src/google/protobuf/descriptor.h +++ b/src/google/protobuf/descriptor.h @@ -58,6 +58,10 @@ #include <vector> #include <google/protobuf/stubs/common.h> +// TYPE_BOOL is defined in the MacOS's ConditionalMacros.h. +#ifdef TYPE_BOOL +#undef TYPE_BOOL +#endif // TYPE_BOOL namespace google { namespace protobuf { diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index b7ac75cc..98800713 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -180,6 +180,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h> #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> +#elif defined(__pnacl__) +#include <google/protobuf/stubs/atomicops_internals_pnacl.h> #else GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc index 0112d992..e6045026 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -183,11 +183,11 @@ void LogMessage::Finish() { if (level_ != LOGLEVEL_FATAL) { InitLogSilencerCountOnce(); MutexLock lock(log_silencer_count_mutex_); - suppress = internal::log_silencer_count_ > 0; + suppress = log_silencer_count_ > 0; } if (!suppress) { - internal::log_handler_(level_, filename_, line_, message_); + log_handler_(level_, filename_, line_, message_); } if (level_ == LOGLEVEL_FATAL) { diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index cba9fbd0..b9c3760f 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -51,6 +51,9 @@ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #elif defined(__pnacl__) #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +#elif defined(__ppc__) +#define GOOGLE_PROTOBUF_ARCH_PPC 1 +#define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #else #error Host architecture was not detected as supported by protobuf #endif |