diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2017-06-02 18:35:07 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2017-06-02 18:35:07 +0000 |
| commit | 660e4022c86e33527dcf4141d50a49c29e7b4a97 (patch) | |
| tree | 782729e82d823bd8a5d65df316b1684fe835f15f /locks/win32 | |
| parent | 23c9f000e96b133991a6518e629aa4d18fc0d0b6 (diff) | |
| download | apr-660e4022c86e33527dcf4141d50a49c29e7b4a97.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 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
Diffstat (limited to 'locks/win32')
| -rw-r--r-- | locks/win32/proc_mutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c index 2370bcc8e..e132e20a2 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); } |