From f3e077c6061cff22f55b09fa8930e51c889cc9fc Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Fri, 2 Jun 2017 18:35:07 +0000 Subject: [PATCH] On Windows, OS2 and BEOS, the singluar lock mechanisms were already compatible with timed locks, so there is no delta between DEFAULT and DEFAULT_TIMED. Avoid gratuitous API changes to typical OS lock information. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1797415 13f79535-47bb-0310-9956-ffa450edef68 --- locks/beos/proc_mutex.c | 6 +++--- locks/os2/proc_mutex.c | 6 +++--- locks/win32/proc_mutex.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/locks/beos/proc_mutex.c b/locks/beos/proc_mutex.c index d253ad5be88..35a5e8f107e 100644 --- a/locks/beos/proc_mutex.c +++ b/locks/beos/proc_mutex.c @@ -168,7 +168,7 @@ APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex) APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) { - return APR_LOCK_DEFAULT_TIMED; + return APR_LOCK_DEFAULT; } APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) @@ -194,7 +194,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex ospmutex->sem = pmutex->Lock; ospmutex->ben = pmutex->LockCount; if (mech) { - *mech = APR_LOCK_DEFAULT_TIMED; + *mech = APR_LOCK_DEFAULT; } return APR_SUCCESS; } @@ -236,7 +236,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, apr_pool_t *pool) { - return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT_TIMED, + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, 0, pool); } diff --git a/locks/os2/proc_mutex.c b/locks/os2/proc_mutex.c index de2e66aeb19..a86c208b324 100644 --- a/locks/os2/proc_mutex.c +++ b/locks/os2/proc_mutex.c @@ -62,7 +62,7 @@ APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex) APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) { - return APR_LOCK_DEFAULT_TIMED; + return APR_LOCK_DEFAULT; } APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) @@ -240,7 +240,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex { *ospmutex = pmutex->hMutex; if (mech) { - *mech = APR_LOCK_DEFAULT_TIMED; + *mech = APR_LOCK_DEFAULT; } return APR_SUCCESS; } @@ -283,7 +283,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, apr_pool_t *pool) { - return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT_TIMED, + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, 0, pool); } diff --git a/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c index 2370bcc8e89..e132e20a2e3 100644 --- a/locks/win32/proc_mutex.c +++ b/locks/win32/proc_mutex.c @@ -228,7 +228,7 @@ APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex) APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex) { - return APR_LOCK_DEFAULT_TIMED; + return APR_LOCK_DEFAULT; } APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) @@ -253,7 +253,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex { *ospmutex = pmutex->handle; if (mech) { - *mech = APR_LOCK_DEFAULT_TIMED; + *mech = APR_LOCK_DEFAULT; } return APR_SUCCESS; } @@ -295,7 +295,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, apr_pool_t *pool) { - return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT_TIMED, + return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT, 0, pool); }