Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit 1446dc9

Browse files
committed
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
1 parent bc65a8d commit 1446dc9

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

lib/Support/Windows/Process.inc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "llvm/Support/Allocator.h"
15+
#include <malloc.h>
16+
17+
// The Windows.h header must be after LLVM and standard headers.
18+
#include "Windows.h"
19+
1520
#include <direct.h>
1621
#include <io.h>
17-
#include <malloc.h>
1822
#include <psapi.h>
1923
#include <shellapi.h>
2024

21-
// The Windows.h header must be the last one included.
22-
#include "Windows.h"
23-
2425
#ifdef __MINGW32__
2526
#if (HAVE_LIBPSAPI != 1)
2627
#error "libpsapi.a should be present"

lib/Support/Windows/Signals.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
#include <stdio.h>
1717
#include <vector>
1818

19+
// The Windows.h header must be after LLVM and standard headers.
20+
#include "Windows.h"
21+
1922
#ifdef __MINGW32__
2023
#include <imagehlp.h>
2124
#else
2225
#include <dbghelp.h>
2326
#endif
2427
#include <psapi.h>
2528

26-
// The Windows.h header must be the last one included.
27-
#include "Windows.h"
28-
2929
#ifdef _MSC_VER
3030
#pragma comment(lib, "psapi.lib")
3131
#pragma comment(lib, "dbghelp.lib")

0 commit comments

Comments
 (0)