merge heads

This commit is contained in:
Yury Selivanov 2014-02-06 00:18:48 -05:00
commit bfafa6198a
1 changed files with 8 additions and 0 deletions

View File

@ -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