diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-04-07 08:44:02 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-04-07 08:44:02 +0000 |
| commit | 0c796ad27879cdea842ea729fac90cc59b6db9b2 (patch) | |
| tree | e1a669245eb8967b797d66c5aebd8b88c319562d /locks | |
| parent | dcb111c6c2c7c8f7575eee1d07c1017eadf671e6 (diff) | |
| download | apr-0c796ad27879cdea842ea729fac90cc59b6db9b2.tar.gz | |
locks: follow up to r1790488 and r1790521: likewise for the
apr_proc_mutex_unix_lock_methods_t's timedacquired method.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790523 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/unix/proc_mutex.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index f35104c11..d49bfe10c 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -60,7 +60,7 @@ static apr_status_t proc_mutex_no_perms_set(apr_proc_mutex_t *mutex, && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) \ && !defined(HAVE_PTHREAD_CONDATTR_SETPSHARED)) static apr_status_t proc_mutex_spinsleep_timedacquire(apr_proc_mutex_t *mutex, - apr_time_t timeout) + apr_interval_time_t timeout) { apr_status_t rv; if (timeout < 0) { @@ -222,7 +222,7 @@ static apr_status_t proc_mutex_posix_tryacquire(apr_proc_mutex_t *mutex) #if defined(HAVE_SEM_TIMEDWAIT) static apr_status_t proc_mutex_posix_timedacquire(apr_proc_mutex_t *mutex, - apr_time_t timeout) + apr_interval_time_t timeout) { if (timeout < 0) { return proc_mutex_posix_acquire(mutex); @@ -380,7 +380,7 @@ static apr_status_t proc_mutex_sysv_tryacquire(apr_proc_mutex_t *mutex) #if defined(HAVE_SEMTIMEDOP) static apr_status_t proc_mutex_sysv_timedacquire(apr_proc_mutex_t *mutex, - apr_time_t timeout) + apr_interval_time_t timeout) { if (timeout < 0) { return proc_mutex_sysv_acquire(mutex); @@ -510,7 +510,7 @@ typedef struct { static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex, - apr_time_t timeout); + apr_interval_time_t timeout); static APR_INLINE int proc_pthread_mutex_inc(apr_proc_mutex_t *mutex) { @@ -702,7 +702,7 @@ static apr_status_t proc_mutex_pthread_tryacquire(apr_proc_mutex_t *mutex) } static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex, - apr_time_t timeout) + apr_interval_time_t timeout) { #if !APR_USE_PROC_PTHREAD_MUTEX_COND && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) return proc_mutex_spinsleep_timedacquire(mutex, timeout); |