Commit 6a10204d authored by pliard@google.com's avatar pliard@google.com

Add missing guard in atomicops MSVC cc file

parent 72afe6ee
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <cstring> #include <cstring>
#include "atomicops.h" #include <google/protobuf/stubs/atomicops.h>
// This file only makes sense with atomicops_internals_x86_gcc.h -- it // This file only makes sense with atomicops_internals_x86_gcc.h -- it
// depends on structs that are defined in that file. If atomicops.h // depends on structs that are defined in that file. If atomicops.h
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <google/protobuf/stubs/atomicops.h> #include <google/protobuf/stubs/atomicops.h>
#ifdef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_MSVC_H_
#include <windows.h> #include <windows.h>
namespace google { namespace google {
...@@ -103,4 +105,5 @@ Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, ...@@ -103,4 +105,5 @@ Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
} // namespace protobuf } // namespace protobuf
} // namespace google } // namespace google
#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_MSVC_H_
#endif // GOOGLE_PROTOBUF_NO_THREADSAFETY #endif // GOOGLE_PROTOBUF_NO_THREADSAFETY
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment