cvs commit: apr/locks/unix proc_mutex.c

[jorton]

jorton      2004/06/15 01:21:22

  Modified:    locks/unix proc_mutex.c
  Log:
  * locks/unix/proc_mutex.c (apr_proc_mutex_lockfile): Fix build on
  platforms without flock.
  
  Revision  Changes    Path
  1.49      +8 -2      apr/locks/unix/proc_mutex.c
  
  Index: proc_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/proc_mutex.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -d -w -u -r1.48 -r1.49
  --- proc_mutex.c      14 Jun 2004 12:16:23 -0000      1.48
  +++ proc_mutex.c      15 Jun 2004 08:21:22 -0000      1.49
  @@ -811,10 +811,16 @@
   {
       /* POSIX sems use the fname field but don't use a file,
        * so be careful. */
  -    if (mutex->meth == &mutex_flock_methods
  -        || mutex->meth == &mutex_fcntl_methods) {
  +#if APR_HAS_FLOCK_SERIALIZE
  +    if (mutex->meth == &mutex_flock_methods) {
  +        return mutex->fname;
  +    }
  +#endif
  +#if APR_HAS_FCNTL_SERIALIZE
  +    if (mutex->meth == &mutex_fcntl_methods) {
           return mutex->fname;
       }
  +#endif
       return NULL;
   }