changeset:   75592:1eaf6e899f02
user:        Victor Stinner <vstinner@wyplay.com>
date:        Tue Mar 13 15:29:08 2012 +0100
files:       Modules/selectmodule.c
description:
Issue #14180: Fix select.select() compilation on BSD and a typo in kqueue_queue_control()


diff -r ed73006bac42 -r 1eaf6e899f02 Modules/selectmodule.c
--- a/Modules/selectmodule.c	Tue Mar 13 13:50:34 2012 +0100
+++ b/Modules/selectmodule.c	Tue Mar 13 15:29:08 2012 +0100
@@ -223,8 +223,10 @@
         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 @@
     PyObject *result = NULL;
     struct kevent *evl = NULL;
     struct kevent *chl = NULL;
-    struct timespec timeoutspec;
+    struct timespec timeout;
     struct timespec *ptimeoutspec;
 
     if (self->kqfd < 0)