diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-04-07 08:58:57 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-04-07 08:58:57 +0000 |
| commit | 30a7d6e9cb02d8b714c3b397af2033b7ea8d9cca (patch) | |
| tree | 636028a76d77b27874200f52214f06b56b091acc /include | |
| parent | 8b5aec3d6115315f79f88fc3eea2698343b39ed7 (diff) | |
| download | apr-30a7d6e9cb02d8b714c3b397af2033b7ea8d9cca.tar.gz | |
Merge r1790521, r1790523 from trunk:
locks: follow up to r1790488.
Make it clear in the type that it's a relative/interval time.
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/branches/1.6.x@1790527 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_global_mutex.h | 2 | ||||
| -rw-r--r-- | include/apr_proc_mutex.h | 2 | ||||
| -rw-r--r-- | include/apr_thread_mutex.h | 2 | ||||
| -rw-r--r-- | include/arch/unix/apr_arch_proc_mutex.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/apr_global_mutex.h b/include/apr_global_mutex.h index a00770507..b1c7f3324 100644 --- a/include/apr_global_mutex.h +++ b/include/apr_global_mutex.h @@ -117,7 +117,7 @@ APR_DECLARE(apr_status_t) apr_global_mutex_trylock(apr_global_mutex_t *mutex); * @param timeout the relative timeout (microseconds) */ APR_DECLARE(apr_status_t) apr_global_mutex_timedlock(apr_global_mutex_t *mutex, - apr_time_t timeout); + apr_interval_time_t timeout); /** * Release the lock for the given mutex. diff --git a/include/apr_proc_mutex.h b/include/apr_proc_mutex.h index 4c0f92bc0..75e255a4c 100644 --- a/include/apr_proc_mutex.h +++ b/include/apr_proc_mutex.h @@ -122,7 +122,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex); * @param timeout the relative timeout (microseconds) */ APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex, - apr_time_t timeout); + apr_interval_time_t timeout); /** * Release the lock for the given mutex. diff --git a/include/apr_thread_mutex.h b/include/apr_thread_mutex.h index efc62f65a..5279a9fa6 100644 --- a/include/apr_thread_mutex.h +++ b/include/apr_thread_mutex.h @@ -90,7 +90,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex); * @param timeout the relative timeout (microseconds) */ APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex, - apr_time_t timeout); + apr_interval_time_t timeout); /** * Release the lock for the given mutex. diff --git a/include/arch/unix/apr_arch_proc_mutex.h b/include/arch/unix/apr_arch_proc_mutex.h index 86aaab5dc..cfa0049f7 100644 --- a/include/arch/unix/apr_arch_proc_mutex.h +++ b/include/arch/unix/apr_arch_proc_mutex.h @@ -70,7 +70,7 @@ struct apr_proc_mutex_unix_lock_methods_t { apr_status_t (*create)(apr_proc_mutex_t *, const char *); apr_status_t (*acquire)(apr_proc_mutex_t *); apr_status_t (*tryacquire)(apr_proc_mutex_t *); - apr_status_t (*timedacquire)(apr_proc_mutex_t *, apr_time_t); + apr_status_t (*timedacquire)(apr_proc_mutex_t *, apr_interval_time_t); apr_status_t (*release)(apr_proc_mutex_t *); apr_status_t (*cleanup)(void *); apr_status_t (*child_init)(apr_proc_mutex_t **, apr_pool_t *, const char *); |