Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-10 17:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tui compilation with Solaris libcurses: non-const last arg to mvwaddstr (PR tui/21482)

Browse Source
This commit is contained in:
Rainer Orth
2017-05-19 14:01:50 +02:00
parent 958d57d02d
commit a1cc26f6c3
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@@ -1,3 +1,12 @@
2017-05-19 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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 <eliz@gnu.org> 2017-05-13 Eli Zaretskii <eliz@gnu.org>
* tui/tui.c (tui_enable): Cast "unknown" to 'char *' to avoid a * tui/tui.c (tui_enable): Cast "unknown" to 'char *' to avoid a

2
gdb/tui/tui-windata.c
View File

@@ -117,7 +117,7 @@ tui_erase_data_content (const char *prompt)
mvwaddstr (TUI_DATA_WIN->generic.handle, mvwaddstr (TUI_DATA_WIN->generic.handle,
(TUI_DATA_WIN->generic.height / 2), (TUI_DATA_WIN->generic.height / 2),
x_pos, x_pos,
prompt); (char *) prompt);
} }
wrefresh (TUI_DATA_WIN->generic.handle); wrefresh (TUI_DATA_WIN->generic.handle);
} }

2
gdb/tui/tui-wingeneral.c
View File

@@ -101,7 +101,7 @@ box_win (struct tui_gen_win_info *win_info,
box (win, tui_border_vline, tui_border_hline); box (win, tui_border_vline, tui_border_hline);
#endif #endif
if (win_info->title) if (win_info->title)
mvwaddstr (win, 0, 3, win_info->title); mvwaddstr (win, 0, 3, (char *) win_info->title);
wattroff (win, attrs); wattroff (win, attrs);
} }
} }

7
gdb/tui/tui-winsource.c
View File

@@ -254,7 +254,7 @@ tui_erase_source_content (struct tui_win_info *win_info,
mvwaddstr (win_info->generic.handle, mvwaddstr (win_info->generic.handle,
(win_info->generic.height / 2), (win_info->generic.height / 2),
x_pos, x_pos,
no_src_str); (char *) no_src_str);
/* elz: Added this function call to set the real contents of /* elz: Added this function call to set the real contents of
the window to what is on the screen, so that later calls 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); wattron (win_info->generic.handle, A_STANDOUT);
mvwaddstr (win_info->generic.handle, lineno, 1, 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) if (line->which_element.source.is_exec_point)
wattroff (win_info->generic.handle, A_STANDOUT); 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, mvwaddstr (exec_info->handle,
cur_line, cur_line,
0, 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); tui_refresh_win (exec_info);
exec_info->content_in_use = TRUE; exec_info->content_in_use = TRUE;
} }