projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Windows.h to WindowsSupport.h to avoid ambiguity
[oota-llvm.git]
/
lib
/
Support
/
Windows
/
Signals.inc
diff --git
a/lib/Support/Windows/Signals.inc
b/lib/Support/Windows/Signals.inc
index 2b4a66d00896f636ec0e6bcd0a1b9d70208c229a..a28b0b8003d34c4310a0f6bd4ac4ff11c142935f 100644
(file)
--- a/
lib/Support/Windows/Signals.inc
+++ b/
lib/Support/Windows/Signals.inc
@@
-12,12
+12,13
@@
//===----------------------------------------------------------------------===//
#include "llvm/Support/FileSystem.h"
//===----------------------------------------------------------------------===//
#include "llvm/Support/FileSystem.h"
-
-#include "Windows.h"
#include <algorithm>
#include <stdio.h>
#include <vector>
#include <algorithm>
#include <stdio.h>
#include <vector>
+// The Windows.h header must be after LLVM and standard headers.
+#include "WindowsSupport.h"
+
#ifdef __MINGW32__
#include <imagehlp.h>
#else
#ifdef __MINGW32__
#include <imagehlp.h>
#else
@@
-135,7
+136,7
@@
typedef PVOID (WINAPI *fpSymFunctionTableAccess64)(HANDLE, DWORD64);
static fpSymFunctionTableAccess64 SymFunctionTableAccess64;
static bool load64BitDebugHelp(void) {
static fpSymFunctionTableAccess64 SymFunctionTableAccess64;
static bool load64BitDebugHelp(void) {
- HMODULE hLib = ::LoadLibrary
(TEXT("Dbghelp.dll")
);
+ HMODULE hLib = ::LoadLibrary
W(L"Dbghelp.dll"
);
if (hLib) {
StackWalk64 = (fpStackWalk64)
::GetProcAddress(hLib, "StackWalk64");
if (hLib) {
StackWalk64 = (fpStackWalk64)
::GetProcAddress(hLib, "StackWalk64");