diff options
| author |   reyk <reyk@openbsd.org> | 2015-01-13 08:33:12 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2015-01-13 08:33:12 +0000 |
| commit | e6f9da1133bf20b2b4e0799b945ca12731fa855b (patch) | |
| tree | 2577c8e073b5cfd148168ccec7271b1c1cf33bde /lib/libedit | |
| parent | use $SSH instead of installed ssh to allow override; spotted by markus@ (diff) | |
| download | wireguard-openbsd-e6f9da1133bf20b2b4e0799b945ca12731fa855b.tar.xz wireguard-openbsd-e6f9da1133bf20b2b4e0799b945ca12731fa855b.zip | |
libedit claims compatibility with readline 4.2, so provide a stub for
rl_set_keyboard_input_timeout() that was added in this version.
Also crank the minor version.
OK krw@ yasuoka@ deraadt@
Diffstat (limited to 'lib/libedit')
| -rw-r--r-- | lib/libedit/readline.c | 9 | ||||
| -rw-r--r-- | lib/libedit/readline/readline.h | 3 | ||||
| -rw-r--r-- | lib/libedit/shlib_version | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 878239fec08..814c865899d 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readline.c,v 1.12 2014/10/15 10:55:11 deraadt Exp $ */ +/* $OpenBSD: readline.c,v 1.13 2015/01/13 08:33:12 reyk Exp $ */ /* $NetBSD: readline.c,v 1.91 2010/08/28 15:44:59 christos Exp $ */ /*- @@ -2244,3 +2244,10 @@ rl_on_new_line(void) { return 0; } + +int +/*ARGSUSED*/ +rl_set_keyboard_input_timeout(int u) +{ + return 0; +} diff --git a/lib/libedit/readline/readline.h b/lib/libedit/readline/readline.h index 22fa8e07d3f..138e189ad10 100644 --- a/lib/libedit/readline/readline.h +++ b/lib/libedit/readline/readline.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readline.h,v 1.5 2011/07/07 05:40:42 okan Exp $ */ +/* $OpenBSD: readline.h,v 1.6 2015/01/13 08:33:12 reyk Exp $ */ /* $NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $ */ /*- @@ -215,6 +215,7 @@ int rl_generic_bind(int, const char *, const char *, Keymap); int rl_bind_key_in_map(int, rl_command_func_t *, Keymap); void rl_cleanup_after_signal(void); void rl_free_line_state(void); +int rl_set_keyboard_input_timeout(int); #ifdef __cplusplus } #endif diff --git a/lib/libedit/shlib_version b/lib/libedit/shlib_version index 900b4048a96..715ca914844 100644 --- a/lib/libedit/shlib_version +++ b/lib/libedit/shlib_version @@ -1,2 +1,2 @@ major=5 -minor=1 +minor=2 |