summaryrefslogtreecommitdiff
path: root/src/gui/curses
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/curses')
-rw-r--r--src/gui/curses/gui-curses-bar-window.c2
-rw-r--r--src/gui/curses/gui-curses-chat.c7
-rw-r--r--src/gui/curses/gui-curses-key.c2
-rw-r--r--src/gui/curses/gui-curses-mouse.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index bb9854d7a..8c6749cd8 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -332,7 +332,7 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
1);
break;
default:
- next_char = utf8_next_char (string);
+ next_char = (char *)utf8_next_char (string);
if (!next_char)
break;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 4731058fc..91c7bc7c1 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -394,7 +394,7 @@ gui_chat_display_word_raw (struct t_gui_window *window, struct t_gui_line *line,
if (!string)
return chars_displayed;
- next_char = utf8_next_char (string);
+ next_char = (char *)utf8_next_char (string);
if (next_char)
{
ptr_char = utf_char;
@@ -1231,8 +1231,9 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
int read_marker_x, read_marker_y;
int word_start_offset, word_end_offset;
int word_length_with_spaces, word_length;
- char *ptr_data, *ptr_end_offset, *next_char;
- char *ptr_style, *message_with_tags, *message_with_search;
+ char *ptr_data, *ptr_end_offset;
+ char *message_with_tags, *message_with_search;
+ const char *ptr_style, *next_char;
struct t_gui_line *ptr_prev_line, *ptr_next_line;
struct tm local_time, local_time2;
struct timeval tv_time;
diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c
index 408d76d81..47356fa27 100644
--- a/src/gui/curses/gui-curses-key.c
+++ b/src/gui/curses/gui-curses-key.c
@@ -380,7 +380,7 @@ gui_key_flush (int paste)
(void) utf8_is_valid (ptr_char, &ptr_error);
if (!ptr_error)
break;
- next_char = utf8_next_char (ptr_error);
+ next_char = (char *)utf8_next_char (ptr_error);
if (next_char && next_char[0])
{
ptr_char = ptr_error;
diff --git a/src/gui/curses/gui-curses-mouse.c b/src/gui/curses/gui-curses-mouse.c
index d20ba4ce2..4162ada77 100644
--- a/src/gui/curses/gui-curses-mouse.c
+++ b/src/gui/curses/gui-curses-mouse.c
@@ -255,7 +255,7 @@ gui_mouse_event_code2key (const char *code)
int i, x, y, code_utf8, length;
double diff_x, diff_y, distance, angle, pi4;
static char key[128];
- char *ptr_code;
+ const char *ptr_code;
key[0] = '\0';