[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#20374)

Fri Jan 24 06:33:41 CET 2014

http://hg.python.org/cpython/rev/eb251e3624df
changeset: 88665:eb251e3624df
parent: 88662:c3e787c44885
parent: 88664:fb2259d9f6b4
user: Benjamin Peterson <benjamin at python.org>
date: Fri Jan 24 00:33:25 2014 -0500
summary:
 merge 3.3 (#20374)
files:
 Misc/NEWS | 2 ++
 Modules/readline.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,8 @@
 loop this caused is now avoided by checking if the expected context is
 already set before trying to fix it.
 
+- Issue #20374: Fix build with GNU readline >= 6.3.
+
 - Issue #20311: select.epoll.poll() now rounds the timeout away from zero,
 instead of rounding towards zero. For example, a timeout of one microsecond
 is now rounded to one millisecond, instead of being rounded to zero.
diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -998,12 +998,12 @@
 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 =
-- 
Repository URL: http://hg.python.org/cpython
