Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

struct timeval.tv_usec is 4 bytes on 64-bit OS X as it should be, but 

is defined as an int while everyone else expects a long regardless of
length.
This commit is contained in:
Brett Cannon 2012-04-07 14:59:29 -04:00
parent 014397e981
commit 8798ad3e1e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/selectmodule.c
View File

@ -237,8 +237,12 @@ select_select(PyObject *self, PyObject *args)
#endif
tv.tv_sec = (long)sec;
#else
if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv.tv_usec) == -1)
/* 64-bit OS X has struct timeval.tv_usec as an int (and thus still 4
bytes as required), but no longer defined by a long. */
long tv_usec = tv.tv_usec;
if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv_usec) == -1)
return NULL;
tv.tv_usec = tv_usec;
#endif
if (tv.tv_sec < 0) {
PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");