diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2017-05-23 20:10:45 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2017-05-23 20:10:45 +0000 |
| commit | a173ba24fa493411bd08b62c962e92b3d38e2a27 (patch) | |
| tree | 7e4946779ca7f2a8ca40c65249b6776bc765369c | |
| parent | 9448434331ae2bf9773549112963d56449872d5d (diff) | |
| download | libapr-a173ba24fa493411bd08b62c962e92b3d38e2a27.tar.gz | |
Revert 1761280 (r1761279 from trunk), was;
locks/netware: follow up to r1667962 and r1667900: fix typos (compile errors).
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795959 13f79535-47bb-0310-9956-ffa450edef68
| -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 31ee97fff..52cd04bf9 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_proc_mutex_t *mutex, +APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_thread_mutex_t *mutex, apr_time_t timeout, int absolute) { diff --git a/locks/netware/thread_cond.c b/locks/netware/thread_cond.c index 432b0d290..da1162bc2 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 / NXGetSystemTick(); + timeout = timeout * 1000 / XGetSystemTick(); 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 c634edfac..a11ad8345 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 != APR_SUCCESS) { + if (rv != 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_wait(mutex->cond, mutex); + rv = apr_thread_cond_dwait(mutex->cond, mutex); } else { if (absolute) { |