diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2017-06-02 18:37:33 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2017-06-02 18:37:33 +0000 |
| commit | d2647d3526fea743dda8a56ed845ea3519866c06 (patch) | |
| tree | 204f4307eb6dcdf8cb8aa36421dbbe534b074094 | |
| parent | 139fec66832ebac0c94f20549f089caecdcec3d3 (diff) | |
| download | apr-d2647d3526fea743dda8a56ed845ea3519866c06.tar.gz | |
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 prohibited API changes to typical OS lock information.
Backport: r1797415
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1797416 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | locks/beos/proc_mutex.c | 6 | ||||
| -rw-r--r-- | locks/os2/proc_mutex.c | 6 | ||||
| -rw-r--r-- | 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 d253ad5be..35a5e8f10 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 de2e66aeb..a86c208b3 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 648c7a14d..d2fe2d450 100644 --- a/locks/win32/proc_mutex.c +++ b/locks/win32/proc_mutex.c @@ -211,7 +211,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) @@ -236,7 +236,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; } @@ -278,7 +278,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); } |