mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
b996f22f8b
Backport two patches from upstream: use new readline function types (closes #20374) Issue #20374: Avoid compiler warnings when compiling readline with libedit. [YOCTO #6107] (From OE-Core rev: a6b91ae7dec2edebc0eaea0592c42b1c455ad4d7) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
python3: fix build error with Readline 6.3
|
|
|
|
Backport two patches from upstream:
|
|
|
|
use new readline function types (closes #20374)
|
|
Issue #20374: Avoid compiler warnings when compiling readline with libedit.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
|
---
|
|
Modules/readline.c | 15 ++++++++++++---
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Modules/readline.c b/Modules/readline.c
|
|
index 096c6d1..1646ef8 100644
|
|
--- a/Modules/readline.c
|
|
+++ b/Modules/readline.c
|
|
@@ -773,15 +773,24 @@ on_hook(PyObject *func)
|
|
return result;
|
|
}
|
|
|
|
+
|
|
static int
|
|
+#if defined(_RL_FUNCTION_TYPEDEF)
|
|
on_startup_hook(void)
|
|
+#else
|
|
+on_startup_hook()
|
|
+#endif
|
|
{
|
|
return on_hook(startup_hook);
|
|
}
|
|
|
|
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
|
static int
|
|
+#if defined(_RL_FUNCTION_TYPEDEF)
|
|
on_pre_input_hook(void)
|
|
+#else
|
|
+on_pre_input_hook()
|
|
+#endif
|
|
{
|
|
return on_hook(pre_input_hook);
|
|
}
|
|
@@ -936,12 +945,12 @@ setup_readline(void)
|
|
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
|
|
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
|
|
/* Set our hook functions */
|
|
- rl_startup_hook = (Function *)on_startup_hook;
|
|
+ rl_startup_hook = (rl_hook_func_t *)on_startup_hook;
|
|
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
|
- rl_pre_input_hook = (Function *)on_pre_input_hook;
|
|
+ rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook;
|
|
#endif
|
|
/* Set our completion function */
|
|
- rl_attempted_completion_function = (CPPFunction *)flex_complete;
|
|
+ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete;
|
|
/* Set Python word break characters */
|
|
completer_word_break_characters =
|
|
rl_completer_word_break_characters =
|
|
--
|
|
1.7.9.5
|
|
|