diff options
| author | Lindsey Kuper <lindsey@rockstargirl.org> | 2011-08-03 19:40:39 -0700 |
|---|---|---|
| committer | Lindsey Kuper <lindsey@rockstargirl.org> | 2011-08-03 19:40:39 -0700 |
| commit | ebca1ae23833353534df4edbfe757dc9c399520a (patch) | |
| tree | 4210dbea03cdbda1f2db72c4cddf74dfa9217c8a | |
| parent | 7a2e9f4874192551e3d9b93607f5de1c812405c5 (diff) | |
| parent | a8943f34423164310c1e8889ec55bb02c03cea2c (diff) | |
| download | rust-ebca1ae23833353534df4edbfe757dc9c399520a.tar.gz rust-ebca1ae23833353534df4edbfe757dc9c399520a.zip | |
Merge pull request #801 from erickt/master
Fix a typo in lock_and_signal.cpp
| -rw-r--r-- | src/rt/sync/lock_and_signal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/sync/lock_and_signal.cpp b/src/rt/sync/lock_and_signal.cpp index 580fcbd6459..3a1c702aac7 100644 --- a/src/rt/sync/lock_and_signal.cpp +++ b/src/rt/sync/lock_and_signal.cpp @@ -78,7 +78,7 @@ bool lock_and_signal::timed_wait(size_t timeout_in_ms) { EnterCriticalSection(&_cs); _holding_thread = GetCurrentThreadId(); #else - if (timeout_in_ns == 0) { + if (timeout_in_ms == 0) { CHECKED(pthread_cond_wait(&_cond, &_mutex)); } else { timeval time_val; |