summaryrefslogtreecommitdiff
path: root/locks/win32
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2002-12-31 17:44:56 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2002-12-31 17:44:56 +0000
commit91008620ecf0456614c38d351f2ad00ef05861fb (patch)
treeaaf61bacc9d95fefe0683872dfed5c58dc9dc038 /locks/win32
parent5b6f334fdad8ec5f224962dcf98845805baad71c (diff)
downloadapr-91008620ecf0456614c38d351f2ad00ef05861fb.tar.gz
A second stab at getting apr_thread_cond_timedwait to work. Someone
else should look at this code, please, and let me know if it follows the correct behavior. It passes the tests, but that presumes the tests themselves are sufficient. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@64243 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks/win32')
-rw-r--r--locks/win32/thread_cond.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/locks/win32/thread_cond.c b/locks/win32/thread_cond.c
index e0c428f72..ee7e9dda1 100644
--- a/locks/win32/thread_cond.c
+++ b/locks/win32/thread_cond.c
@@ -128,7 +128,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
while (1) {
res = WaitForSingleObject(cond->mutex, timeout_ms);
if (res != WAIT_OBJECT_0) {
- if (res == WAIT_ABANDONED) {
+ if (res == WAIT_TIMEOUT) {
return APR_TIMEUP;
}
return apr_get_os_error();
@@ -142,7 +142,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
if (res != WAIT_OBJECT_0) {
apr_status_t rv = apr_get_os_error();
ReleaseMutex(cond->mutex);
- if (res == WAIT_ABANDONED) {
+ if (res == WAIT_TIMEOUT) {
rv = APR_TIMEUP;
}
return rv;