diff options
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/netware/proc_mutex.c | 2 | ||||
| -rw-r--r-- | locks/netware/thread_cond.c | 2 | ||||
| -rw-r--r-- | locks/netware/thread_mutex.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c index 581b24350..231f242b4 100644 --- a/locks/netware/proc_mutex.c +++ b/locks/netware/proc_mutex.c @@ -72,7 +72,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex) return APR_ENOLOCK; } -APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_thread_mutex_t *mutex, +APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex, apr_time_t timeout, int absolute) { diff --git a/locks/netware/thread_cond.c b/locks/netware/thread_cond.c index da1162bc2..432b0d290 100644 --- a/locks/netware/thread_cond.c +++ b/locks/netware/thread_cond.c @@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond, rc = NXCondWait(cond->cond, mutex->mutex); } else { - timeout = timeout * 1000 / XGetSystemTick(); + timeout = timeout * 1000 / NXGetSystemTick(); rc = NXCondTimedWait(cond->cond, mutex->mutex, timeout); if (rc == NX_ETIMEDOUT) { return APR_TIMEUP; diff --git a/locks/netware/thread_mutex.c b/locks/netware/thread_mutex.c index a11ad8345..c634edfac 100644 --- a/locks/netware/thread_mutex.c +++ b/locks/netware/thread_mutex.c @@ -55,7 +55,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex, if (flags & APR_THREAD_MUTEX_TIMED) { apr_status_t rv = apr_thread_cond_create(&new_mutex->cond, pool); - if (rv != SUCCESS) { + if (rv != APR_SUCCESS) { NXMutexFree(new_mutex->mutex); return rv; } @@ -121,7 +121,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex, if (mutex->locked) { mutex->num_waiters++; if (timeout < 0) { - rv = apr_thread_cond_dwait(mutex->cond, mutex); + rv = apr_thread_cond_wait(mutex->cond, mutex); } else { if (absolute) { |