diff options
author | Joerg Bruehe <joerg@mysql.com> | 2009-07-09 23:10:50 +0200 |
---|---|---|
committer | Joerg Bruehe <joerg@mysql.com> | 2009-07-09 23:10:50 +0200 |
commit | 9313d74e913cf7a3ce4f019d323c4689842af074 (patch) | |
tree | 90adb4d952d048c2bf8d97e20ef78c5b0af453ec /cmd-line-utils/readline/rlprivate.h | |
parent | a1af64f3adc136a2874940880e3bb6ae17b10b07 (diff) | |
parent | 006d97dc972bead95351dba20a1027d235d1b05f (diff) | |
download | mariadb-git-9313d74e913cf7a3ce4f019d323c4689842af074.tar.gz |
Merge main 5.0 into 5.0-build.
Diffstat (limited to 'cmd-line-utils/readline/rlprivate.h')
-rw-r--r-- | cmd-line-utils/readline/rlprivate.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cmd-line-utils/readline/rlprivate.h b/cmd-line-utils/readline/rlprivate.h index 64aa7bdd3fa..1ab696766b0 100644 --- a/cmd-line-utils/readline/rlprivate.h +++ b/cmd-line-utils/readline/rlprivate.h @@ -77,7 +77,7 @@ typedef struct __rl_search_context int sline_len; int sline_index; - char *search_terminators; + const char *search_terminators; } _rl_search_cxt; /* Callback data for reading numeric arguments */ @@ -164,7 +164,7 @@ extern int rl_set_retained_kills PARAMS((int)); extern void _rl_set_screen_size PARAMS((int, int)); /* undo.c */ -extern int _rl_fix_last_undo_of_type PARAMS((int, int, int)); +extern int _rl_fix_last_undo_of_type PARAMS((enum undo_code, int, int)); /* util.c */ extern char *_rl_savestring PARAMS((const char *)); @@ -359,7 +359,7 @@ extern int _rl_vis_botlin; extern int _rl_last_c_pos; extern int _rl_suppress_redisplay; extern int _rl_want_redisplay; -extern char *rl_display_prompt; +extern const char *rl_display_prompt; /* isearch.c */ extern char *_rl_isearch_terminators; @@ -398,17 +398,17 @@ extern _rl_search_cxt *_rl_nscxt; /* terminal.c */ extern int _rl_enable_keypad; extern int _rl_enable_meta; -extern char *_rl_term_clreol; -extern char *_rl_term_clrpag; -extern char *_rl_term_im; -extern char *_rl_term_ic; -extern char *_rl_term_ei; -extern char *_rl_term_DC; -extern char *_rl_term_up; -extern char *_rl_term_dc; -extern char *_rl_term_cr; -extern char *_rl_term_IC; -extern char *_rl_term_forward_char; +extern const char *_rl_term_clreol; +extern const char *_rl_term_clrpag; +extern const char *_rl_term_im; +extern const char *_rl_term_ic; +extern const char *_rl_term_ei; +extern const char *_rl_term_DC; +extern const char *_rl_term_up; +extern const char *_rl_term_dc; +extern const char *_rl_term_cr; +extern const char *_rl_term_IC; +extern const char *_rl_term_forward_char; extern int _rl_screenheight; extern int _rl_screenwidth; extern int _rl_screenchars; |