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

ned-deily · jcfr · commit 6028e7fdf121 · 2018-03-19T02:41:44.000-04:00
See python/cpython@b0fd12d
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -735,15 +735,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
`@@ -735,15 +735,24 @@ on_hook(PyObject *func)`
`735`	`735`	`return result;`
`736`	`736`	`}`
`737`	`737`
	`738`	`+`
`738`	`739`	`static int`
	`740`	`+#if defined(_RL_FUNCTION_TYPEDEF)`
`739`	`741`	`on_startup_hook(void)`
	`742`	`+#else`
	`743`	`+on_startup_hook()`
	`744`	`+#endif`
`740`	`745`	`{`
`741`	`746`	`return on_hook(startup_hook);`
`742`	`747`	`}`
`743`	`748`
`744`	`749`	`#ifdef HAVE_RL_PRE_INPUT_HOOK`
`745`	`750`	`static int`
	`751`	`+#if defined(_RL_FUNCTION_TYPEDEF)`
`746`	`752`	`on_pre_input_hook(void)`
	`753`	`+#else`
	`754`	`+on_pre_input_hook()`
	`755`	`+#endif`
`747`	`756`	`{`
`748`	`757`	`return on_hook(pre_input_hook);`
`749`	`758`	`}`