From 6a10204df6e22945ccf816bdf354525e7b07467b Mon Sep 17 00:00:00 2001
From: "pliard@google.com"
 <pliard@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Thu, 8 Mar 2012 14:27:30 +0000
Subject: [PATCH] Add missing guard in atomicops MSVC cc file

---
 src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc  | 2 +-
 src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc b/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
index 7552721888..937aa5abaa 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 a4c7c42c7c..4686bc44d9 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