[Python-checkins] cpython (merge default -> default): merge heads

Thu Feb 6 06:19:09 CET 2014

http://hg.python.org/cpython/rev/259857de72e1
changeset: 88987:259857de72e1
parent: 88986:4a3761dedbd2
parent: 88985:0b91e764b889
user: Yury Selivanov <yselivanov at sprymix.com>
date: Thu Feb 06 00:18:48 2014 -0500
summary:
 merge heads
files:
 Modules/readline.c | 8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -816,7 +816,11 @@
 }
 
 static int
+#if defined(_RL_FUNCTION_TYPEDEF)
 on_startup_hook(void)
+#else
+on_startup_hook()
+#endif
 {
 int r;
 #ifdef WITH_THREAD
@@ -831,7 +835,11 @@
 
 #ifdef HAVE_RL_PRE_INPUT_HOOK
 static int
+#if defined(_RL_FUNCTION_TYPEDEF)
 on_pre_input_hook(void)
+#else
+on_pre_input_hook()
+#endif
 {
 int r;
 #ifdef WITH_THREAD
-- 
Repository URL: http://hg.python.org/cpython
