You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2017/06/02 18:56:09 UTC
svn commit: r1797419 - /apr/apr/branches/1.7.x/locks/netware/proc_mutex.c
Author: wrowe
Date: Fri Jun 2 18:56:08 2017
New Revision: 1797419
URL: http://svn.apache.org/viewvc?rev=1797419&view=rev
Log:
Avoid API change during the remainder of 1.x, corresponds to 1.5 behavior
Modified:
apr/apr/branches/1.7.x/locks/netware/proc_mutex.c
Modified: apr/apr/branches/1.7.x/locks/netware/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/locks/netware/proc_mutex.c?rev=1797419&r1=1797418&r2=1797419&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/locks/netware/proc_mutex.c (original)
+++ apr/apr/branches/1.7.x/locks/netware/proc_mutex.c Fri Jun 2 18:56:08 2017
@@ -129,9 +129,9 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
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_mu
*mech = APR_LOCK_DEFAULT;
}
return APR_SUCCESS;
-#else
- return APR_ENOTIMPL;
#endif
}
@@ -161,7 +159,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
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