From 71b38063b282937640e05ab219c2baa6ed7d4ac7 Mon Sep 17 00:00:00 2001 From: Muhammad Omair Javaid Date: Tue, 7 Mar 2023 05:36:27 +0400 Subject: Fix LLDB windows build LLDB WoA buildbot is failing due to pid_t redefinition after recent changes in lldb/source/Plugins/ScriptInterpreter/Python/ScriptedProcessPythonInterface.cpp. Process.h includes PosixApi.h which defines pid_t. Python.h on windows also typedefs pid_t. To make sure that we include Python.h before PosixApi this patch renforces the workaround previously set up to guard this issue. https://lab.llvm.org/buildbot/#/builders/219 Reviewed By: mib Differential Revision: https://reviews.llvm.org/D145446 --- .../ScriptInterpreter/Python/ScriptedProcessPythonInterface.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptedProcessPythonInterface.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptedProcessPythonInterface.cpp index cffa3bd..c985065 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptedProcessPythonInterface.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptedProcessPythonInterface.cpp @@ -7,6 +7,10 @@ //===----------------------------------------------------------------------===// #include "lldb/Host/Config.h" +#if LLDB_ENABLE_PYTHON +// LLDB Python header must be included first +#include "lldb-python.h" +#endif #include "lldb/Target/Process.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Status.h" @@ -14,9 +18,6 @@ #if LLDB_ENABLE_PYTHON -// LLDB Python header must be included first -#include "lldb-python.h" - #include "SWIGPythonBridge.h" #include "ScriptInterpreterPythonImpl.h" #include "ScriptedProcessPythonInterface.h" -- cgit v1.1