[Lldb-commits] [lldb] r306186 - Fix LLDB build.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Fri Jun 23 18:55:32 2017
New Revision: 306186

URL: http://llvm.org/viewvc/llvm-project?rev=306186&view=rev
Log:
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.

Modified:
    lldb/trunk/source/Core/IOHandler.cpp
    lldb/trunk/source/Core/Mangled.cpp

Modified: lldb/trunk/source/Core/IOHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/IOHandler.cpp?rev=306186&r1=306185&r2=306186&view=diff
==============================================================================
--- lldb/trunk/source/Core/IOHandler.cpp (original)
+++ lldb/trunk/source/Core/IOHandler.cpp Fri Jun 23 18:55:32 2017
@@ -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

Modified: lldb/trunk/source/Core/Mangled.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Mangled.cpp?rev=306186&r1=306185&r2=306186&view=diff
==============================================================================
--- lldb/trunk/source/Core/Mangled.cpp (original)
+++ lldb/trunk/source/Core/Mangled.cpp Fri Jun 23 18:55:32 2017
@@ -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")