Author: Raphael Isemann Date: 2020-08-06T10:52:57+02:00 New Revision: d40c44e89e11659439072a4b57d2c0c191d5cae5
URL: https://github.com/llvm/llvm-project/commit/d40c44e89e11659439072a4b57d2c0c191d5cae5 DIFF: https://github.com/llvm/llvm-project/commit/d40c44e89e11659439072a4b57d2c0c191d5cae5.diff LOG: [lldb] Fix LLDB compilation with ncurses 6.2 due to wattr_set/get being a macro My ncurses 6.2 arch defines those two functions as macros, so the scope operator doesn't work here. Added: Modified: lldb/source/Core/IOHandlerCursesGUI.cpp Removed: ################################################################################ diff --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp index 9ae077124ab1..931ddb2ea9e3 100644 --- a/lldb/source/Core/IOHandlerCursesGUI.cpp +++ b/lldb/source/Core/IOHandlerCursesGUI.cpp @@ -486,7 +486,7 @@ class Window { attr_t saved_attr; short saved_pair; int saved_opts; - ::wattr_get(m_window, &saved_attr, &saved_pair, &saved_opts); + wattr_get(m_window, &saved_attr, &saved_pair, &saved_opts); if (use_blue_background) ::wattron(m_window, COLOR_PAIR(WhiteOnBlue)); while (!string.empty()) { @@ -522,7 +522,7 @@ class Window { continue; } if (value == 0) { // Reset. - ::wattr_set(m_window, saved_attr, saved_pair, &saved_opts); + wattr_set(m_window, saved_attr, saved_pair, &saved_opts); if (use_blue_background) ::wattron(m_window, COLOR_PAIR(WhiteOnBlue)); } else { @@ -531,7 +531,7 @@ class Window { COLOR_PAIR(value - 30 + 1 + (use_blue_background ? 8 : 0))); } } - ::wattr_set(m_window, saved_attr, saved_pair, &saved_opts); + wattr_set(m_window, saved_attr, saved_pair, &saved_opts); } void Touch() { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits