diff options
author | Martin Panter <vadmium+py@gmail.com> | 2015-10-07 10:01:04 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2015-10-07 10:01:04 +0000 |
commit | 6e1d0fd29a658fa402340dbc031e4fc7db202ee7 (patch) | |
tree | 43991206a47c92f8b2ac1d4a1a938f31e5294f08 /Python/condvar.h | |
parent | ffee692e0ddd36e128c7dc3632b1e795a9a8a289 (diff) | |
parent | 51dc66135fd222c634512dfacba7a799372d230f (diff) | |
download | cpython-6e1d0fd29a658fa402340dbc031e4fc7db202ee7.tar.gz |
Issue #25286: Merge dictionary view glossary from 3.4 into 3.5
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 */ |