Issue #20374: merge

ned-deily · ned-deily · commit 4b104abdc99d · 2014-02-05T16:55:20.000-08:00
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -815,8 +815,13 @@ on_hook(PyObject *func)
     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 @@ on_startup_hook(void)
 
 #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
