Merge recent changes from LLVM's lib/Support/Atomic.cpp

[android-x86/external-swiftshader.git] / third_party / llvm-subzero / lib / Support / Atomic.cpp

diff --git a/third_party/llvm-subzero/lib/Support/Atomic.cpp b/third_party/llvm-subzero/lib/Support/Atomic.cpp
index 80550e2..7328a93 100644 (file)
--- a/third_party/llvm-subzero/lib/Support/Atomic.cpp
+++ b/third_party/llvm-subzero/lib/Support/Atomic.cpp
@@ -17,7 +17,9 @@
 using namespace llvm;
 
 #if defined(_MSC_VER)
-#include <Intrin.h>
+#include <intrin.h>
+
+// We must include windows.h after intrin.h.
 #include <windows.h>
 #undef MemoryFence
 #endif