From 6b680cd6b2a0ecc8d5e6fe671e2eda6608c53a85 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 16 May 2015 15:57:56 +0300 Subject: [PATCH] Fixed compilation error in signalmodule.c (issue #20182). --- Modules/clinic/signalmodule.c.h | 10 +++++----- Modules/signalmodule.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h index 30dc7453380..ec07ef1f8e7 100644 --- a/Modules/clinic/signalmodule.c.h +++ b/Modules/clinic/signalmodule.c.h @@ -333,20 +333,20 @@ PyDoc_STRVAR(signal_sigtimedwait__doc__, static PyObject * signal_sigtimedwait_impl(PyModuleDef *module, PyObject *sigset, - PyObject *timeout); + PyObject *timeout_obj); static PyObject * signal_sigtimedwait(PyModuleDef *module, PyObject *args) { PyObject *return_value = NULL; PyObject *sigset; - PyObject *timeout; + PyObject *timeout_obj; if (!PyArg_UnpackTuple(args, "sigtimedwait", 2, 2, - &sigset, &timeout)) + &sigset, &timeout_obj)) goto exit; - return_value = signal_sigtimedwait_impl(module, sigset, timeout); + return_value = signal_sigtimedwait_impl(module, sigset, timeout_obj); exit: return return_value; @@ -429,4 +429,4 @@ exit: #ifndef SIGNAL_PTHREAD_KILL_METHODDEF #define SIGNAL_PTHREAD_KILL_METHODDEF #endif /* !defined(SIGNAL_PTHREAD_KILL_METHODDEF) */ -/*[clinic end generated code: output=65ca7b83632eda99 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b99278c16c40ea43 input=a9049054013a1b77]*/ diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index d7b44f66951..70f30521498 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -1017,7 +1017,7 @@ signal_sigwaitinfo(PyModuleDef *module, PyObject *sigset) signal.sigtimedwait sigset: object - timeout: object + timeout as timeout_obj: object / Like sigwaitinfo(), but with a timeout. @@ -1027,8 +1027,8 @@ The timeout is specified in seconds, with floating point numbers allowed. static PyObject * signal_sigtimedwait_impl(PyModuleDef *module, PyObject *sigset, - PyObject *timeout) -/*[clinic end generated code: output=e6e049f2bddea688 input=036bbab9b15cb8de]*/ + PyObject *timeout_obj) +/*[clinic end generated code: output=c1960b5cea139929 input=53fd4ea3e3724eb8]*/ { struct timespec ts; sigset_t set;