From f343968f5d87a91e020a5baf03c280ce7aa9cdb1 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 9 Aug 2016 23:06:08 +0000 Subject: Delete Host/windows/win32.h It's always hard to remember when to include this file, and when you do include it it's hard to remember what preprocessor check it needs to be behind, and then you further have to remember whether it's windows.h or win32.h which you need to include. This patch changes the name to PosixApi.h, which is more appropriately named, and makes it independent of any preprocessor setting. There's still the issue of people not knowing when to include this, because there's not a well-defined set of things it exposes other than "whatever is missing on Windows", but at least this should make it less painful to fix when problems arise. This patch depends on LLVM revision r278170. llvm-svn: 278177 --- .../Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 6 +++--- lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 0025161988c..23075e1bf55 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -989,7 +989,7 @@ protected: void ScriptInterpreterPython::ExecuteInterpreterLoop () { - Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); + Timer scoped_timer (LLVM_PRETTY_FUNCTION, LLVM_PRETTY_FUNCTION); Debugger &debugger = GetCommandInterpreter().GetDebugger(); @@ -2025,7 +2025,7 @@ ScriptInterpreterPython::GetScriptedSummary(const char *python_function_name, ll std::string &retval) { - Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); + Timer scoped_timer (LLVM_PRETTY_FUNCTION, LLVM_PRETTY_FUNCTION); if (!valobj.get()) { @@ -3191,7 +3191,7 @@ ScriptInterpreterPython::InitializePrivate () g_initialized = true; - Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); + Timer scoped_timer (LLVM_PRETTY_FUNCTION, LLVM_PRETTY_FUNCTION); // RAII-based initialization which correctly handles multiple-initialization, version- // specific differences among Python 2 and Python 3, and saving and restoring various diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h b/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h index 013492c39bf..55878a88600 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h @@ -15,6 +15,12 @@ #ifdef LLDB_DISABLE_PYTHON // Python is disabled in this build #else +#include "llvm/Support/Compiler.h" +#if defined(LLVM_ON_WIN32) +// If anyone #includes Host/PosixApi.h later, it will try to typedef pid_t. We need to ensure +// this doesn't happen. +#define NO_PID_T +#endif #if defined(__linux__) // features.h will define _POSIX_C_SOURCE if _GNU_SOURCE is defined. This value // may be different from the value that Python defines it to be which results -- cgit v1.2.3