Author: labath Date: Wed Jun 20 02:00:30 2018 New Revision: 335106 URL: http://llvm.org/viewvc/llvm-project?rev=335106&view=rev Log: Fix windows build broken by r335104
lldb-python.h needs to be included first to work around some incompatibilities between windows and python headers. Modified: lldb/trunk/source/API/SBHostOS.cpp Modified: lldb/trunk/source/API/SBHostOS.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBHostOS.cpp?rev=335106&r1=335105&r2=335106&view=diff ============================================================================== --- lldb/trunk/source/API/SBHostOS.cpp (original) +++ lldb/trunk/source/API/SBHostOS.cpp Wed Jun 20 02:00:30 2018 @@ -7,6 +7,10 @@ // //===----------------------------------------------------------------------===// +#ifndef LLDB_DISABLE_PYTHON +#include "Plugins/ScriptInterpreter/Python/lldb-python.h" +#endif + #include "lldb/API/SBHostOS.h" #include "lldb/API/SBError.h" #include "lldb/Host/Host.h" @@ -18,7 +22,9 @@ #include "lldb/Utility/Log.h" #include "Plugins/ExpressionParser/Clang/ClangHost.h" +#ifndef LLDB_DISABLE_PYTHON #include "Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h" +#endif #include "llvm/ADT/SmallString.h" #include "llvm/Support/Path.h" @@ -49,7 +55,9 @@ SBFileSpec SBHostOS::GetLLDBPath(lldb::P fspec = HostInfo::GetHeaderDir(); break; case ePathTypePythonDir: +#ifndef LLDB_DISABLE_PYTHON fspec = ScriptInterpreterPython::GetPythonDir(); +#endif break; case ePathTypeLLDBSystemPlugins: fspec = HostInfo::GetSystemPluginDir(); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits