diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-04-17 20:16:52 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-04-17 20:16:52 (GMT) |
| commit | 0471ac3d80cb9acdfc82b053145477f5f1e7c6f1 (patch) | |
| tree | 13f4d83ad674abf729dc4c01e7183c2b92aac1a2 /Modules/signalmodule.c | |
| parent | 409c31390f839debb2f05cef691e8b59e52bd524 (diff) | |
| parent | cf8a1e51ece7cad7096963927993ddfa738627e6 (diff) | |
| download | cpython-0471ac3d80cb9acdfc82b053145477f5f1e7c6f1.zip cpython-0471ac3d80cb9acdfc82b053145477f5f1e7c6f1.tar.gz cpython-0471ac3d80cb9acdfc82b053145477f5f1e7c6f1.tar.bz2 | |
Merge.
Diffstat (limited to 'Modules/signalmodule.c')
| -rw-r--r-- | Modules/signalmodule.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 41acbfa..0cc7237 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -784,14 +784,18 @@ signal_sigtimedwait(PyObject *self, PyObject *args) struct timespec buf; sigset_t set; siginfo_t si; + time_t tv_sec; + long tv_nsec; int err; if (!PyArg_ParseTuple(args, "OO:sigtimedwait", &signals, &timeout)) return NULL; - if (_PyTime_ObjectToTimespec(timeout, &buf.tv_sec, &buf.tv_nsec) == -1) + if (_PyTime_ObjectToTimespec(timeout, &tv_sec, &tv_nsec) == -1) return NULL; + buf.tv_sec = tv_sec; + buf.tv_nsec = tv_nsec; if (buf.tv_sec < 0 || buf.tv_nsec < 0) { PyErr_SetString(PyExc_ValueError, "timeout must be non-negative"); |