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

ned-deily · jcfr · commit 857b4ec12438 · 2018-03-19T02:42:53.000-04:00
See python/cpython@b0fd12d
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -747,15 +747,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
`@@ -747,15 +747,24 @@ on_hook(PyObject *func)`
`747`	`747`	`return result;`
`748`	`748`	`}`
`749`	`749`
	`750`	`+`
`750`	`751`	`static int`
	`752`	`+#if defined(_RL_FUNCTION_TYPEDEF)`
`751`	`753`	`on_startup_hook(void)`
	`754`	`+#else`
	`755`	`+on_startup_hook()`
	`756`	`+#endif`
`752`	`757`	`{`
`753`	`758`	`return on_hook(startup_hook);`
`754`	`759`	`}`
`755`	`760`
`756`	`761`	`#ifdef HAVE_RL_PRE_INPUT_HOOK`
`757`	`762`	`static int`
	`763`	`+#if defined(_RL_FUNCTION_TYPEDEF)`
`758`	`764`	`on_pre_input_hook(void)`
	`765`	`+#else`
	`766`	`+on_pre_input_hook()`
	`767`	`+#endif`
`759`	`768`	`{`
`760`	`769`	`return on_hook(pre_input_hook);`
`761`	`770`	`}`