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

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

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>
* tui/tui.c (tui_enable): Cast "unknown" to 'char *' to avoid a

View File

@@ -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);
}

View File

@@ -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);
}
}

View File

@@ -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;
}