Re: svn commit: r1797267 - in /apr/apr/branches/1.6.x: CHANGES locks/beos/proc_mutex.c locks/netware/proc_mutex.c locks/os2/proc_mutex.c locks/win32/proc_mutex.c

[Yann Ylavic]

On Thu, Jun 1, 2017 at 11:10 PM,  <wr...@apache.org> wrote:
> Author: wrowe
> Date: Thu Jun  1 21:10:38 2017
> New Revision: 1797267
>
> URL: http://svn.apache.org/viewvc?rev=1797267&view=rev
> Log:
> Partially revert 1738806 (r1733775, r1738791 from trunk), preserve
> apr_os_proc_mutex_get_ex|_put_ex, but fall back to the supported
> APR_LOCK_DEFAULT
[]
>
> Modified: apr/apr/branches/1.6.x/locks/os2/proc_mutex.c
> URL: 
> http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/locks/os2/proc_mutex.c?rev=1797267&r1=1797266&r2=1797267&view=diff
> ==============================================================================
> --- apr/apr/branches/1.6.x/locks/os2/proc_mutex.c (original)
> +++ apr/apr/branches/1.6.x/locks/os2/proc_mutex.c Thu Jun  1 21:10:38 2017
> @@ -62,7 +62,7 @@ APR_DECLARE(const char *) apr_proc_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)
> @@ -218,7 +218,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
>  {
>      *ospmutex = pmutex->hMutex;
>      if (mech) {
> -        *mech = APR_LOCK_DEFAULT_TIMED;
> +        return *mech = APR_LOCK_DEFAULT;

return?

>      }
>      return APR_SUCCESS;
>  }