summaryrefslogtreecommitdiff
path: root/cmd-line-utils/readline/readline.h
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-06-29 16:00:47 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-06-29 16:00:47 +0200
commitdb1591a7a295c0c4d57cf8c7cbbd0fe1f33ffa49 (patch)
tree4e9ce667a1b14bf9610672bb5f604bb5f5becbab /cmd-line-utils/readline/readline.h
parenta0b5d1be2b15e3064142e3fa2e337143f950e702 (diff)
parent19dfaa5824ef47de51a568be4e7a30ff028bcbe8 (diff)
downloadmariadb-git-db1591a7a295c0c4d57cf8c7cbbd0fe1f33ffa49.tar.gz
Merge from 5.0
Diffstat (limited to 'cmd-line-utils/readline/readline.h')
-rw-r--r--cmd-line-utils/readline/readline.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/readline.h b/cmd-line-utils/readline/readline.h
index b71bf98d204..668a452c765 100644
--- a/cmd-line-utils/readline/readline.h
+++ b/cmd-line-utils/readline/readline.h
@@ -304,7 +304,7 @@ extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *))
extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap));
-extern char *rl_variable_value PARAMS((const char *));
+extern const char *rl_variable_value PARAMS((const char *));
extern int rl_variable_bind PARAMS((const char *, const char *));
/* Backwards compatibility, use rl_bind_keyseq_in_map instead. */
@@ -343,7 +343,7 @@ extern void rl_set_keymap PARAMS((Keymap));
extern Keymap rl_get_keymap PARAMS((void));
/* Undocumented; used internally only. */
extern void rl_set_keymap_from_edit_mode PARAMS((void));
-extern char *rl_get_keymap_name_from_edit_mode PARAMS((void));
+extern const char *rl_get_keymap_name_from_edit_mode PARAMS((void));
/* Functions for manipulating the funmap, which maps command names to functions. */
extern int rl_add_funmap_entry PARAMS((const char *, rl_command_func_t *));
@@ -406,7 +406,7 @@ extern void rl_set_screen_size PARAMS((int, int));
extern void rl_get_screen_size PARAMS((int *, int *));
extern void rl_reset_screen_size PARAMS((void));
-extern char *rl_get_termcap PARAMS((const char *));
+extern const char *rl_get_termcap PARAMS((const char *));
/* Functions for character input. */
extern int rl_stuff_char PARAMS((int));