summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-02-06 00:55:20 (GMT)
committerNed Deily <nad@acm.org>2014-02-06 00:55:20 (GMT)
commit4b104abdc99d79c995edcaf9f8096841cfbcfe6a (patch)
tree9fd58a482373bbe7c76a17270714ac043052db4a /Modules
parente694c9745f2a9cbb46154e290c84c02d77066055 (diff)
parent7b9ddea80b12fa39f38e6742166399d23c818adc (diff)
downloadcpython-4b104abdc99d79c995edcaf9f8096841cfbcfe6a.zip
cpython-4b104abdc99d79c995edcaf9f8096841cfbcfe6a.tar.gz
cpython-4b104abdc99d79c995edcaf9f8096841cfbcfe6a.tar.bz2
Issue #20374: merge
Diffstat (limited to 'Modules')
-rw-r--r--Modules/readline.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/readline.c b/Modules/readline.c
index 02521aa..494bc38 100644
--- 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