Try to fix the windows build. The comments in other files don't seem to

be quite accurate. =]

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198690 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc
index 939d350fb07de0285a16f892e47aa0419cb0264f..750097eecf48677e741e255fb8897bf5ea9e2316 100644 (file)
--- a/lib/Support/Windows/Process.inc
+++ b/lib/Support/Windows/Process.inc
@@ -12,15 +12,16 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Allocator.h"
+#include <malloc.h>
+
+// The Windows.h header must be after LLVM and standard headers.
+#include "Windows.h"
+
 #include <direct.h>
 #include <io.h>
-#include <malloc.h>
 #include <psapi.h>
 #include <shellapi.h>
 
-// The Windows.h header must be the last one included.
-#include "Windows.h"
-
 #ifdef __MINGW32__
  #if (HAVE_LIBPSAPI != 1)
   #error "libpsapi.a should be present"

diff --git a/lib/Support/Windows/Signals.inc b/lib/Support/Windows/Signals.inc
index 2997199f1170e92a758afd89363dd1a77964a407..5add76a0c03b5967ba34bfa07a795aef5774b6a5 100644 (file)
--- a/lib/Support/Windows/Signals.inc
+++ b/lib/Support/Windows/Signals.inc
@@ -16,6 +16,9 @@
 #include <stdio.h>
 #include <vector>
 
+// The Windows.h header must be after LLVM and standard headers.
+#include "Windows.h"
+
 #ifdef __MINGW32__
  #include <imagehlp.h>
 #else
@@ -23,9 +26,6 @@
 #endif
 #include <psapi.h>
 
-// The Windows.h header must be the last one included.
-#include "Windows.h"
-
 #ifdef _MSC_VER
  #pragma comment(lib, "psapi.lib")
  #pragma comment(lib, "dbghelp.lib")