From: Victor Stinner <vstinner@wyplay.com>
Date: Tue, 13 Mar 2012 14:29:08 +0000 (+0100)
Subject: Issue #14180: Fix select.select() compilation on BSD and a typo in kqueue_queue_control()
X-Git-Tag: v3.3.0a2~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d327f9de1f9affd2ce7296c5cdc3984ded1ee747;p=python

Issue #14180: Fix select.select() compilation on BSD and a typo in kqueue_queue_control()
---

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 4d9925005d..179dd61856 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -223,8 +223,10 @@ select_select(PyObject *self, PyObject *args)
         return NULL;
     }
     else {
-        if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv.tv_usec) == -1)
+        long usec;
+        if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &usec) == -1)
             return NULL;
+        tv.tv_usec = usec;
         if (tv.tv_sec < 0) {
             PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
             return NULL;
@@ -1837,7 +1839,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     PyObject *result = NULL;
     struct kevent *evl = NULL;
     struct kevent *chl = NULL;
-    struct timespec timeoutspec;
+    struct timespec timeout;
     struct timespec *ptimeoutspec;
 
     if (self->kqfd < 0)