diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2017-05-23 20:06:32 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2017-05-23 20:06:32 +0000 |
| commit | a43515d8010139a0e3f374657eebb9135fedc1b9 (patch) | |
| tree | 7eb04bab8b756044de2012fdc2332e4a7adcb7b4 /locks | |
| parent | 5cbc2b4002911e85ddb6abea86eb39dd42fc25e2 (diff) | |
| download | apr-a43515d8010139a0e3f374657eebb9135fedc1b9.tar.gz | |
Revert 1778111 (r1774973 from trunk); was
Not all pthread implementations have mutex_timedlock(),
like Solaris 8, so proc_mutex_proc_pthread_timedacquire()
can return APR_ENOTIMPL.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795956 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/unix/proc_mutex.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index 9731457e5..c1d2a23db 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -654,7 +654,6 @@ static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex, apr_time_t timeout, int absolute) { -#ifdef HAVE_PTHREAD_MUTEX_TIMEDLOCK if (timeout < 0) { return proc_mutex_pthread_acquire(mutex); } @@ -689,9 +688,6 @@ static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex, } mutex->curr_locked = 1; return APR_SUCCESS; -#else - return APR_ENOTIMPL; -#endif } static apr_status_t proc_mutex_pthread_release(apr_proc_mutex_t *mutex) |