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

[ned.deily]

http://hg.python.org/cpython/rev/0abf103f5559
changeset:   88982:0abf103f5559
parent:      88979:260d6e1e9b0f
parent:      88981:9131a9edcac4
user:        Ned Deily <nad at acm.org>
date:        Wed Feb 05 16:55:20 2014 -0800
summary:
  Issue #20374: merge

files:
  Modules/readline.c |  9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -815,8 +815,13 @@
     return result;
 }
 
+
 static int
+#if defined(_RL_FUNCTION_TYPEDEF)
 on_startup_hook(void)
+#else
+on_startup_hook()
+#endif
 {
     int r;
 #ifdef WITH_THREAD
@@ -831,7 +836,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