Index: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc |
diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc |
index 741b164f0ff3aa466982426ed7992e61de3a5d45..74a1bd4e064b8d89b6893661120344c6f8e82dd3 100644 |
--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc |
+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc |
@@ -44,9 +44,10 @@ namespace google { |
namespace protobuf { |
namespace internal { |
-inline void MemoryBarrier() { |
- // We use MemoryBarrier from WinNT.h |
- ::MemoryBarrier(); |
+inline void MemoryBarrierInternal() { |
+ // On ARM this is a define while on x86/x64 this is |
+ // a function declared in WinNT.h |
+ MemoryBarrier(); |
} |
Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, |