Issue #20374: Avoid compiler warnings when compiling readline with libedit.

ned-deily · ned-deily · commit 7b9ddea80b12 · 2014-02-05T16:53:10.000-08:00
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -773,15 +773,24 @@ on_hook(PyObject *func)`
`773`	`773`	`return result;`
`774`	`774`	`}`
`775`	`775`
	`776`	`+`
`776`	`777`	`static int`
	`778`	`+#if defined(_RL_FUNCTION_TYPEDEF)`
`777`	`779`	`on_startup_hook(void)`
	`780`	`+#else`
	`781`	`+on_startup_hook()`
	`782`	`+#endif`
`778`	`783`	`{`
`779`	`784`	`return on_hook(startup_hook);`
`780`	`785`	`}`
`781`	`786`
`782`	`787`	`#ifdef HAVE_RL_PRE_INPUT_HOOK`
`783`	`788`	`static int`
	`789`	`+#if defined(_RL_FUNCTION_TYPEDEF)`
`784`	`790`	`on_pre_input_hook(void)`
	`791`	`+#else`
	`792`	`+on_pre_input_hook()`
	`793`	`+#endif`
`785`	`794`	`{`
`786`	`795`	`return on_hook(pre_input_hook);`
`787`	`796`	`}`