From aaea8ee628b47db4815bea5cbcca0e24fa5654f3 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 23 Jun 2017 23:55:32 +0000 Subject: [PATCH] Fix LLDB build. 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. llvm-svn: 306186 --- lldb/source/Core/IOHandler.cpp | 2 +- lldb/source/Core/Mangled.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Core/IOHandler.cpp b/lldb/source/Core/IOHandler.cpp index 3cb1ffab3a0e..194fec8a8798 100644 --- a/lldb/source/Core/IOHandler.cpp +++ b/lldb/source/Core/IOHandler.cpp @@ -58,7 +58,7 @@ #include "llvm/ADT/StringRef.h" // for StringRef #ifdef _MSC_VER -#include +#include "lldb/Host/windows/windows.h" #endif #include // for shared_ptr diff --git a/lldb/source/Core/Mangled.cpp b/lldb/source/Core/Mangled.cpp index c2e9b8904a0a..4dac0b8f3bf1 100644 --- a/lldb/source/Core/Mangled.cpp +++ b/lldb/source/Core/Mangled.cpp @@ -10,7 +10,7 @@ #include "lldb/Core/Mangled.h" #if defined(_WIN32) -#include +#include "lldb/Host/windows/windows.h" #include #pragma comment(lib, "dbghelp.lib")