summaryrefslogtreecommitdiff
path: root/locks
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2017-04-05 17:10:31 +0000
committerJim Jagielski <jim@apache.org>2017-04-05 17:10:31 +0000
commit18f44873c69fc9e59669e619054ab9fd3c21b808 (patch)
treecbac42e9b5b17f667dbd7a2f946cf72f8042f060 /locks
parentb6b9736ccb532b4b741d7ef2db404c67cd6512c1 (diff)
downloadapr-18f44873c69fc9e59669e619054ab9fd3c21b808.tar.gz
Use our "portable" versions
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790303 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r--locks/unix/proc_mutex.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index 1ae4be8a5..e8f460410 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -181,7 +181,9 @@ static apr_status_t proc_mutex_posix_timedacquire(apr_proc_mutex_t *mutex,
apr_time_t timeout,
int absolute)
{
-#if HAVE_SEM_TIMEDWAIT
+#if !HAVE_SEM_TIMEDWAIT
+extern int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout);
+#endif
if (timeout < 0) {
return proc_mutex_posix_acquire(mutex);
}
@@ -207,9 +209,6 @@ static apr_status_t proc_mutex_posix_timedacquire(apr_proc_mutex_t *mutex,
}
mutex->curr_locked = 1;
return APR_SUCCESS;
-#else
- return APR_ENOTIMPL;
-#endif
}
static apr_status_t proc_mutex_posix_release(apr_proc_mutex_t *mutex)
@@ -336,7 +335,10 @@ static apr_status_t proc_mutex_sysv_timedacquire(apr_proc_mutex_t *mutex,
apr_time_t timeout,
int absolute)
{
-#if HAVE_SEMTIMEDOP
+#if !HAVE_SEMTIMEDOP
+extern int semtimedop(int semid, struct sembuf *sops, unsigned nsops,
+ const struct timespec *abs_timeout);
+#endif
if (timeout < 0) {
return proc_mutex_sysv_acquire(mutex);
}
@@ -364,9 +366,6 @@ static apr_status_t proc_mutex_sysv_timedacquire(apr_proc_mutex_t *mutex,
}
mutex->curr_locked = 1;
return APR_SUCCESS;
-#else
- return APR_ENOTIMPL;
-#endif
}
static apr_status_t proc_mutex_sysv_release(apr_proc_mutex_t *mutex)