aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc2
-rw-r--r--src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc b/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
index 75527218..937aa5ab 100644
--- a/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
+++ b/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
@@ -33,7 +33,7 @@
#include <cstring>
-#include "atomicops.h"
+#include <google/protobuf/stubs/atomicops.h>
// This file only makes sense with atomicops_internals_x86_gcc.h -- it
// depends on structs that are defined in that file. If atomicops.h
diff --git a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
index a4c7c42c..4686bc44 100644
--- a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
+++ b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
@@ -33,6 +33,8 @@
#include <google/protobuf/stubs/atomicops.h>
+#ifdef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_MSVC_H_
+
#include <windows.h>
namespace google {
@@ -103,4 +105,5 @@ Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
} // namespace protobuf
} // namespace google
+#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_MSVC_H_
#endif // GOOGLE_PROTOBUF_NO_THREADSAFETY