Fix build error in Mac atomicops.

src/google/protobuf/stubs/atomicops_internals_x86_macosx.h

@@ -252,7 +252,7 @@ inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
 inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
                                          AtomicWord old_value,
                                          AtomicWord new_value) {
-  return v8::internal::Acquire_CompareAndSwap(
+  return Acquire_CompareAndSwap(
       reinterpret_cast<volatile AtomicWordCastType*>(ptr),
       old_value, new_value);
 }
@@ -260,7 +260,7 @@ inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
 inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr,
                                          AtomicWord old_value,
                                          AtomicWord new_value) {
-  return v8::internal::Release_CompareAndSwap(
+  return Release_CompareAndSwap(
       reinterpret_cast<volatile AtomicWordCastType*>(ptr),
       old_value, new_value);
 }
@@ -271,12 +271,12 @@ inline void NoBarrier_Store(volatile AtomicWord* ptr, AtomicWord value) {
 }
 
 inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return v8::internal::Acquire_Store(
+  return Acquire_Store(
       reinterpret_cast<volatile AtomicWordCastType*>(ptr), value);
 }
 
 inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return v8::internal::Release_Store(
+  return Release_Store(
       reinterpret_cast<volatile AtomicWordCastType*>(ptr), value);
 }
 
@@ -286,12 +286,12 @@ inline AtomicWord NoBarrier_Load(volatile const AtomicWord* ptr) {
 }
 
 inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) {
-  return v8::internal::Acquire_Load(
+  return Acquire_Load(
       reinterpret_cast<volatile const AtomicWordCastType*>(ptr));
 }
 
 inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
-  return v8::internal::Release_Load(
+  return Release_Load(
       reinterpret_cast<volatile const AtomicWordCastType*>(ptr));
 }
 

src/google/protobuf/stubs/platform_macros.h

@@ -55,7 +55,7 @@
 #define GOOGLE_PROTOBUF_HOST_ARCH_MIPS 1
 #define GOOGLE_PROTOBUF_HOST_ARCH_32_BIT 1
 #else
-#error Host architecture was not detected as supported by v8
+#error Host architecture was not detected as supported by protobuf
 #endif
 
 // Target architecture detection. This may be set externally. If not, detect
@@ -74,7 +74,7 @@
 #elif defined(__MIPSEL__)
 #define GOOGLE_PROTOBUF_TARGET_ARCH_MIPS 1
 #else
-#error Target architecture was not detected as supported by v8
+#error Target architecture was not detected as supported by protobuf
 #endif
 #endif
 
@@ -111,7 +111,7 @@
 #endif
 #elif GOOGLE_PROTOBUF_TARGET_ARCH_MIPS
 #else
-#error Target architecture is not supported by v8
+#error Target architecture is not supported by protobuf
 #endif
 
 #if (defined(__APPLE__) && defined(__MACH__)) || \