diff options
| author | Rainer Jung <rjung@apache.org> | 2017-01-10 11:25:00 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2017-01-10 11:25:00 +0000 |
| commit | c1dadca890e47a7c15ddaf22ad94490170d35d8c (patch) | |
| tree | 5121b43ac8caa3e8d76415305d7d31bf05600f21 /locks | |
| parent | f96db22101e788d753db4bea828b1046a452580e (diff) | |
| download | apr-c1dadca890e47a7c15ddaf22ad94490170d35d8c.tar.gz | |
locks: follow up to r1667900.
Not all pthread implementations have mutex_timedlock(),
like Solaris 8, so proc_mutex_proc_pthread_timedacquire()
can return APR_ENOTIMPL.
Backport of r1774973 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1778111 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/unix/proc_mutex.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index cbd495602..5f0e744a4 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -654,6 +654,7 @@ 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); } @@ -688,6 +689,9 @@ 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) |