Issue #20374: merge

This commit is contained in:
Ned Deily 2014-02-05 16:55:20 -08:00
commit 4b104abdc9
1 changed files with 9 additions and 0 deletions

View File

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