You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/05/08 15:19:54 UTC

cvs commit: httpd-2.0/os/unix unixd.c

trawick     02/05/08 06:19:54

  Modified:    os/unix  unixd.c
  Log:
  APR_PROC_MUTEX_IS_GLOBAL is the condition where apr_global_mutex_t
  and apr_proc_mutex_t are interchangeable
  
  Revision  Changes    Path
  1.51      +4 -4      httpd-2.0/os/unix/unixd.c
  
  Index: unixd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/unix/unixd.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- unixd.c	6 May 2002 18:19:53 -0000	1.50
  +++ unixd.c	8 May 2002 13:19:54 -0000	1.51
  @@ -416,14 +416,14 @@
   
   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,