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 | 10b0915f85543f01e82b8d145a35cf7cbe1db1a2 (patch) | |
| tree | 48a0b0664a8c0d6dab685c70c01a4d5566e5c019 /llvm/lib/Support | |
| parent | 58c0d69689dc02f3c2882f95a7005a6f8c3a5046 (diff) | |
| download | bcm5719-llvm-10b0915f85543f01e82b8d145a35cf7cbe1db1a2.tar.gz bcm5719-llvm-10b0915f85543f01e82b8d145a35cf7cbe1db1a2.zip | |
Try to fix the windows build. The comments in other files don't seem to
be quite accurate. =]
llvm-svn: 198690
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Windows/Process.inc | 9 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Signals.inc | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/llvm/lib/Support/Windows/Process.inc b/llvm/lib/Support/Windows/Process.inc index 939d350fb07..750097eecf4 100644 --- a/llvm/lib/Support/Windows/Process.inc +++ b/llvm/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/llvm/lib/Support/Windows/Signals.inc b/llvm/lib/Support/Windows/Signals.inc index 2997199f117..5add76a0c03 100644 --- a/llvm/lib/Support/Windows/Signals.inc +++ b/llvm/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") |
