From a1cc26f6c36117f7abbd1e7d347030c37ebb30b6 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 19 May 2017 14:01:50 +0200 Subject: [PATCH] Fix tui compilation with Solaris libcurses: non-const last arg to mvwaddstr (PR tui/21482) --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-windata.c | 2 +- gdb/tui/tui-wingeneral.c | 2 +- gdb/tui/tui-winsource.c | 7 ++++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ff9579f9a79..9754ba0474d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2017-05-19 Rainer Orth + + * tui/tui-windata.c (tui_erase_data_content): Cast last mvwaddstr + arg to char *. + * tui/tui-wingeneral.c (box_win): Likewise. + * tui/tui-winsource.c (tui_erase_source_content): Likewise. + (tui_show_source_line): Likewise. + (tui_show_exec_info_content): Likewise. + 2017-05-13 Eli Zaretskii * tui/tui.c (tui_enable): Cast "unknown" to 'char *' to avoid a diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 8e7d55c4205..e7571e632c8 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -117,7 +117,7 @@ tui_erase_data_content (const char *prompt) mvwaddstr (TUI_DATA_WIN->generic.handle, (TUI_DATA_WIN->generic.height / 2), x_pos, - prompt); + (char *) prompt); } wrefresh (TUI_DATA_WIN->generic.handle); } diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 16b466ddff2..5dd2c01bcac 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -101,7 +101,7 @@ box_win (struct tui_gen_win_info *win_info, box (win, tui_border_vline, tui_border_hline); #endif if (win_info->title) - mvwaddstr (win, 0, 3, win_info->title); + mvwaddstr (win, 0, 3, (char *) win_info->title); wattroff (win, attrs); } } diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 73ad93f324a..3ae9c712299 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -254,7 +254,7 @@ tui_erase_source_content (struct tui_win_info *win_info, mvwaddstr (win_info->generic.handle, (win_info->generic.height / 2), x_pos, - no_src_str); + (char *) no_src_str); /* elz: Added this function call to set the real contents of the window to what is on the screen, so that later calls @@ -280,7 +280,7 @@ tui_show_source_line (struct tui_win_info *win_info, int lineno) wattron (win_info->generic.handle, A_STANDOUT); mvwaddstr (win_info->generic.handle, lineno, 1, - line->which_element.source.line); + (char *) line->which_element.source.line); if (line->which_element.source.is_exec_point) wattroff (win_info->generic.handle, A_STANDOUT); @@ -565,7 +565,8 @@ tui_show_exec_info_content (struct tui_win_info *win_info) mvwaddstr (exec_info->handle, cur_line, 0, - exec_info->content[cur_line - 1]->which_element.simple_string); + (char *) exec_info->content[cur_line - 1] + ->which_element.simple_string); tui_refresh_win (exec_info); exec_info->content_in_use = TRUE; } -- 2.47.3