diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2014-01-07 12:37:13 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2014-01-07 12:37:13 +0000 |
| commit | 1446dc9ba819441283fab5b7fce12f7fa5a4ad17 (patch) | |
| tree | bbd9896b28da61a6531e2e8e8374a538d36fb202 /lib/Support | |
| parent | bc65a8d518ebe0408deb15d9314fd2ff5cbd0686 (diff) | |
| download | llvm-1446dc9ba819441283fab5b7fce12f7fa5a4ad17.tar.gz llvm-1446dc9ba819441283fab5b7fce12f7fa5a4ad17.tar.bz2 llvm-1446dc9ba819441283fab5b7fce12f7fa5a4ad17.tar.xz | |
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
Diffstat (limited to 'lib/Support')
| -rw-r--r-- | lib/Support/Windows/Process.inc | 9 | ||||
| -rw-r--r-- | lib/Support/Windows/Signals.inc | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc index 939d350fb0..750097eecf 100644 --- 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 2997199f11..5add76a0c0 100644 --- 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") |