Commit 4388a971 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

APR_PROC_MUTEX_IS_GLOBAL is the condition where apr_global_mutex_t 

and apr_proc_mutex_t are interchangeable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95009 13f79535-47bb-0310-9956-ffa450edef68
parent bcfbf78b

os/unix/unixd.c

+4 −4
Changes for os/unix/unixd.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -416,14 +416,14 @@ AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex) 


AP_DECLARE(apr_status_t) unixd_set_global_mutex_perms(apr_global_mutex_t *gmutex)

{

#if !APR_PROCESS_LOCK_IS_GLOBAL

#if !APR_PROC_MUTEX_IS_GLOBAL

    apr_os_global_mutex_t osgmutex;

    apr_os_global_mutex_get(&osgmutex, gmutex);

    return unixd_set_proc_mutex_perms(osgmutex.proc_mutex);

#else  /* APR_PROCESS_LOCK_IS_GLOBAL */

#else  /* APR_PROC_MUTEX_IS_GLOBAL */

    /* In this case, apr_proc_mutex_t and apr_global_mutex_t are the same. */

    return unixd_set_proc_mutex_perms((apr_proc_mutex_t *)gmutex);

#endif /* APR_PROCESS_LOCK_IS_GLOBAL */

    return unixd_set_proc_mutex_perms(gmutex);

#endif /* APR_PROC_MUTEX_IS_GLOBAL */

}



AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr,