locks: follow up to r1667900.

ylavic · ylavic · commit 1b19c5d3e932 · 2016-12-19T00:45:38.000Z
As noticed by rjung, 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/trunk@1774973 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
@@ -649,6 +649,7 @@ proc_mutex_proc_pthread_timedacquire(apr_proc_mutex_t *mutex,
                                      apr_time_t timeout,
                                      int absolute)
 {
+#ifdef HAVE_PTHREAD_MUTEX_TIMEDLOCK
     if (timeout < 0) {
         return proc_mutex_proc_pthread_acquire(mutex);
     }
@@ -683,6 +684,9 @@ proc_mutex_proc_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_proc_pthread_release(apr_proc_mutex_t *mutex)

Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,7 @@ proc_mutex_proc_pthread_timedacquire(apr_proc_mutex_t *mutex,`
`649`	`649`	`apr_time_t timeout,`
`650`	`650`	`int absolute)`
`651`	`651`	`{`
	`652`	`+#ifdef HAVE_PTHREAD_MUTEX_TIMEDLOCK`
`652`	`653`	`if (timeout < 0) {`
`653`	`654`	`return proc_mutex_proc_pthread_acquire(mutex);`
`654`	`655`	`}`
`@@ -683,6 +684,9 @@ proc_mutex_proc_pthread_timedacquire(apr_proc_mutex_t *mutex,`
`683`	`684`	`}`
`684`	`685`	`mutex->curr_locked = 1;`
`685`	`686`	`return APR_SUCCESS;`
	`687`	`+#else`
	`688`	`+ return APR_ENOTIMPL;`
	`689`	`+#endif`
`686`	`690`	`}`
`687`	`691`
`688`	`692`	`static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)`