traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Yury Selivanov 2014-02-06 00:18:48 -05:00
parent f0020f5d77 93db29b5c1
commit bfafa6198a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/readline.c
View File

@ -816,7 +816,11 @@ on_hook(PyObject *func)
} }
static int static int
#if defined(_RL_FUNCTION_TYPEDEF)
on_startup_hook(void) on_startup_hook(void)
#else
on_startup_hook()
#endif
{ {
int r; int r;
#ifdef WITH_THREAD #ifdef WITH_THREAD
@ -831,7 +835,11 @@ on_startup_hook(void)
#ifdef HAVE_RL_PRE_INPUT_HOOK #ifdef HAVE_RL_PRE_INPUT_HOOK
static int static int
#if defined(_RL_FUNCTION_TYPEDEF)
on_pre_input_hook(void) on_pre_input_hook(void)
#else
on_pre_input_hook()
#endif
{ {
int r; int r;
#ifdef WITH_THREAD #ifdef WITH_THREAD