diff options
| author | Zachary Turner <zturner@google.com> | 2017-06-23 23:55:32 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-06-23 23:55:32 +0000 |
| commit | 002cc9f498a8cda3eba457ce36f7b8de08ba3512 (patch) | |
| tree | a1798c870aff95b5b18874c1749c5470aadc97c8 | |
| parent | 3d9b13a30132643afd3a33e8a617c4dcdf526fe4 (diff) | |
| download | lldb-upstream-mirror.tar.gz | |
Fix LLDB build.upstream-mirror
This was broken due to directly including windows.h, which
caused a problem when someone in LLVM called std::min in a header
file. LLDB has a windows.h include to work around this, but it
wasn't being used in these two files.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@306186 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | source/Core/IOHandler.cpp | 2 | ||||
| -rw-r--r-- | source/Core/Mangled.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/Core/IOHandler.cpp b/source/Core/IOHandler.cpp index 3cb1ffab3..194fec8a8 100644 --- a/source/Core/IOHandler.cpp +++ b/source/Core/IOHandler.cpp @@ -58,7 +58,7 @@ #include "llvm/ADT/StringRef.h" // for StringRef #ifdef _MSC_VER -#include <windows.h> +#include "lldb/Host/windows/windows.h" #endif #include <memory> // for shared_ptr diff --git a/source/Core/Mangled.cpp b/source/Core/Mangled.cpp index c2e9b8904..4dac0b8f3 100644 --- a/source/Core/Mangled.cpp +++ b/source/Core/Mangled.cpp @@ -10,7 +10,7 @@ #include "lldb/Core/Mangled.h" #if defined(_WIN32) -#include <windows.h> +#include "lldb/Host/windows/windows.h" #include <dbghelp.h> #pragma comment(lib, "dbghelp.lib") |