httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/locks/unix locks.c
Date Fri, 11 Aug 2000 16:38:35 GMT
trawick     00/08/11 09:38:33

  Modified:    src      CHANGES
               src/lib/apr/locks/unix locks.c
  Log:
  APR locks on Unix: Let APR_LOCKALL locks work when APR isn't
  built with thread support.  The code needed to realize that
  with APR_LOCKALL the intra-thread lock is a no-op.
  
  Revision  Changes    Path
  1.199     +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- CHANGES	2000/08/11 04:13:42	1.198
  +++ CHANGES	2000/08/11 16:38:29	1.199
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a6
  +  *) APR locks on Unix: Let APR_LOCKALL locks work when APR isn't
  +     built with thread support.  [Jeff Trawick]
  +
     *) Abort configuration if --with-layout was specified and there's
        no layout definition file.  [Ken Coar]
   
  
  
  
  1.40      +8 -4      apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- locks.c	2000/08/02 05:26:21	1.39
  +++ locks.c	2000/08/11 16:38:32	1.40
  @@ -83,7 +83,9 @@
               return stat;
           }
   #else
  -        return APR_ENOTIMPL;
  +        if (scope != APR_LOCKALL) {
  +            return APR_ENOTIMPL;
  +        }
   #endif
       }
       if (scope != APR_INTRAPROCESS) {
  @@ -104,7 +106,7 @@
               return stat;
           }
   #else
  -        return APR_ENOTIMPL;
  +        /* must be APR_LOCKALL */
   #endif
       }
       if (lock->scope != APR_INTRAPROCESS) {
  @@ -125,7 +127,7 @@
               return stat;
           }
   #else
  -        return APR_ENOTIMPL;
  +        /* must be APR_LOCKALL */
   #endif
       }
       if (lock->scope != APR_INTRAPROCESS) {
  @@ -145,7 +147,9 @@
               return stat;
           }
   #else
  -        return APR_ENOTIMPL;
  +        if (lock->scope != APR_LOCKALL) {
  +            return APR_ENOTIMPL;
  +        }
   #endif
       }
       if (lock->scope != APR_INTRAPROCESS) {
  
  
  

Mime
View raw message