diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2017-06-02 18:56:08 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2017-06-02 18:56:08 +0000 |
| commit | c9916716e8fe37ec92f7dec74ea3a329b12a72e2 (patch) | |
| tree | 0fbc62f420bdb258113d2695cb76187b0d5d5191 | |
| parent | d2647d3526fea743dda8a56ed845ea3519866c06 (diff) | |
| download | apr-c9916716e8fe37ec92f7dec74ea3a329b12a72e2.tar.gz | |
Avoid API change during the remainder of 1.x, corresponds to 1.5 behavior
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1797419 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | locks/netware/proc_mutex.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c index 639748533..799d3bcb6 100644 --- a/locks/netware/proc_mutex.c +++ b/locks/netware/proc_mutex.c @@ -129,9 +129,9 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex apr_proc_mutex_t *pmutex, apr_lockmech_e *mech) { - if (!pmutex->mutex) { - return APR_ENOLOCK; - } + if (pmutex && pmutex->mutex) + ospmutex = pmutex->mutex->mutex; + return APR_ENOLOCK; #if 0 /* We need to change apr_os_proc_mutex_t to a pointer type * to be able to implement this function. @@ -141,8 +141,6 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex *mech = APR_LOCK_DEFAULT; } return APR_SUCCESS; -#else - return APR_ENOTIMPL; #endif } @@ -161,7 +159,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, if (pool == NULL) { return APR_ENOPOOL; } - if (mech != APR_LOCK_DEFAULT) { + if (mech != APR_LOCK_DEFAULT && mech != APR_LOCK_DEFAULT_TIMED) { return APR_ENOTIMPL; } #if 0 |