diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2014-02-06 05:18:48 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2014-02-06 05:18:48 (GMT) |
| commit | bfafa6198affa9073f640d94508b70ff7766bacd (patch) | |
| tree | 6b335f259dce9aa185246732aeef4e81614206d9 | |
| parent | f0020f5d7762a73e77bc7be79251e2ebb3a4a727 (diff) | |
| parent | 93db29b5c136c7c2c6e655d0e80343f481ccd15d (diff) | |
| download | cpython-bfafa6198affa9073f640d94508b70ff7766bacd.zip cpython-bfafa6198affa9073f640d94508b70ff7766bacd.tar.gz cpython-bfafa6198affa9073f640d94508b70ff7766bacd.tar.bz2 | |
merge heads
| -rw-r--r-- | Modules/readline.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/readline.c b/Modules/readline.c index 02521aa..0be39da 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -816,7 +816,11 @@ on_hook(PyObject *func) } static int +#if defined(_RL_FUNCTION_TYPEDEF) on_startup_hook(void) +#else +on_startup_hook() +#endif { int r; #ifdef WITH_THREAD @@ -831,7 +835,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 |