]> granicus.if.org Git - python/commitdiff
Fixed compilation error in signalmodule.c (issue #20182).
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 16 May 2015 12:57:56 +0000 (15:57 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 16 May 2015 12:57:56 +0000 (15:57 +0300)
Modules/clinic/signalmodule.c.h
Modules/signalmodule.c

index 30dc7453380c7ac7cc3ab91cdbd6d8df6126a274..ec07ef1f8e7c33c4f4daa0ea61882db4768a015a 100644 (file)
@@ -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]*/
index d7b44f66951b32786b7f3e8d8ba01622860262cf..70f305214988327cf672f9191533cb21a9e8901f 100644 (file)
@@ -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;