diff options
| author | Lars Gust?bel <lars@gustaebel.de> | 2015-07-02 19:41:03 +0200 |
|---|---|---|
| committer | Lars Gust?bel <lars@gustaebel.de> | 2015-07-02 19:41:03 +0200 |
| commit | a0333aa657baeb3738a8c2fe211168cb1dbab8ac (patch) | |
| tree | 9d48b355036c218e706d4e0c698fc3586673bd5b /Python/condvar.h | |
| parent | e8c3a8aa583475fa33dd8b74959193217cb56933 (diff) | |
| parent | c6050850b5f399a24702795515d02fdf06b01b4f (diff) | |
| download | cpython-a0333aa657baeb3738a8c2fe211168cb1dbab8ac.tar.gz | |
Merge with 3.4: Issue #24514: tarfile now tolerates number fields consisting of only whitespace.
Diffstat (limited to 'Python/condvar.h')
| -rw-r--r-- | Python/condvar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/condvar.h b/Python/condvar.h index ef818c4d4b..bb5b1b661f 100644 --- a/Python/condvar.h +++ b/Python/condvar.h @@ -1,4 +1,4 @@ -/* +/* * Portable condition variable support for windows and pthreads. * Everything is inline, this header can be included where needed. * @@ -105,7 +105,7 @@ PyCOND_TIMEDWAIT(PyCOND_T *cond, PyMUTEX_T *mut, PY_LONG_LONG us) return 1; else if (r) return -1; - else + else return 0; } @@ -255,7 +255,7 @@ _PyCOND_WAIT_MS(PyCOND_T *cv, PyMUTEX_T *cs, DWORD ms) * a new thread comes along, it will pass right throuhgh, having * adjusted it to (waiting == 0 && sem.count == 0). */ - + if (wait == WAIT_FAILED) return -1; /* return 0 on success, 1 on timeout */ |