summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-21 14:34:47 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-21 14:34:47 +0000
commit43f2652caae5d8d1f3cdcd56c192f2352c40ac78 (patch)
tree210dd35969b617b4b2284f27b3cb402f4c7edac4
parent51e08ba186ed2b9fca31ba90ab4e60d58f6360ba (diff)
2008-08-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* display.c, histexpand.c, terminal.c: Fix warnings. * ChangeLog: New file.
-rw-r--r--readline-4.3/ChangeLog5
-rw-r--r--readline-4.3/display.c2
-rw-r--r--readline-4.3/histexpand.c4
-rw-r--r--readline-4.3/terminal.c2
4 files changed, 9 insertions, 4 deletions
diff --git a/readline-4.3/ChangeLog b/readline-4.3/ChangeLog
new file mode 100644
index 0000000..9e5af6b
--- /dev/null
+++ b/readline-4.3/ChangeLog
@@ -0,0 +1,5 @@
+2008-08-21 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * display.c, histexpand.c, terminal.c: Fix warnings.
+ * ChangeLog: New file.
+
diff --git a/readline-4.3/display.c b/readline-4.3/display.c
index 5150ea6..1488036 100644
--- a/readline-4.3/display.c
+++ b/readline-4.3/display.c
@@ -1604,7 +1604,7 @@ _rl_move_cursor_relative (new, data)
}
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_last_c_pos = _rl_col_width (data, 0, new);
+ _rl_last_c_pos = _rl_col_width ((char *)data, 0, new);
else
_rl_last_c_pos = new;
}
diff --git a/readline-4.3/histexpand.c b/readline-4.3/histexpand.c
index 6c81196..5ed8bae 100644
--- a/readline-4.3/histexpand.c
+++ b/readline-4.3/histexpand.c
@@ -211,8 +211,8 @@ get_history_event (string, caller_index, delimiting_quote)
memset (&ps, 0, sizeof (mbstate_t));
/* These produce warnings because we're passing a const string to a
function that takes a non-const string. */
- _rl_adjust_point (string, i, &ps);
- if ((v = _rl_get_char_len (string + i, &ps)) > 1)
+ _rl_adjust_point ((char *)string, i, &ps);
+ if ((v = _rl_get_char_len ((char *)string + i, &ps)) > 1)
{
i += v - 1;
continue;
diff --git a/readline-4.3/terminal.c b/readline-4.3/terminal.c
index f3f5b6c..4788247 100644
--- a/readline-4.3/terminal.c
+++ b/readline-4.3/terminal.c
@@ -350,7 +350,7 @@ get_term_capabilities (bp)
# ifdef __LCC__
*(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp);
# else
- *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp);
+ *(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp);
# endif
#endif
tcap_initialized = 1;