Fix another ordering constraint with windows.h and comment about

a revers constraint that we got right (by chance). llvm-svn: 304792
llvm · Jun 6, 2017 · aaeada6 · aaeada6
1 parent 3842327
commit aaeada6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -38,8 +38,10 @@
 #include <cstring>
 
 #if defined(_MSC_VER)
-#include <DbgHelp.h>
 #include <Windows.h>
+
+// This must be included after windows.h.
+#include <DbgHelp.h>
 #pragma comment(lib, "dbghelp.lib")
 
 // Windows.h conflicts with our COFF header definitions.

diff --git a/llvm/lib/Support/Atomic.cpp b/llvm/lib/Support/Atomic.cpp
@@ -18,6 +18,8 @@ using namespace llvm;
 
 #if defined(_MSC_VER)
 #include <Intrin.h>
+
+// We must include windows.h after Intrin.h.
 #include <windows.h>
 #undef MemoryFence
 #endif