apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr/locks/beos intraproc.c
Date Wed, 06 Jun 2001 21:51:20 GMT
dreid       01/06/06 14:51:19

  Modified:    include/arch/beos locks.h
               locks/beos intraproc.c
  Log:
  Fix a couple of errors that slipped through earlier...
  
  Revision  Changes    Path
  1.16      +2 -1      apr/include/arch/beos/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/beos/locks.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- locks.h	2001/06/06 18:11:16	1.15
  +++ locks.h	2001/06/06 21:51:17	1.16
  @@ -60,12 +60,13 @@
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  +#include "apr_portable.h"
   
   struct apr_lock_t {
       apr_pool_t *pool;
       apr_locktype_e type;
       apr_lockscope_e scope;
  -    apr_os_thread_t *owner;
  +    apr_os_thread_t owner;
       int owner_ref;
       /* Inter proc */
       sem_id sem_interproc;
  
  
  
  1.19      +3 -3      apr/locks/beos/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/beos/intraproc.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- intraproc.c	2001/06/05 13:22:28	1.18
  +++ intraproc.c	2001/06/06 21:51:18	1.19
  @@ -77,8 +77,8 @@
       }
       new->ben_intraproc = 0;
       new->sem_intraproc = stat;
  -    APR_CLEANUP_REGISTER(new, (void *)new, lock_intra_cleanup,
  -                        apr_pool_cleanup_null);
  +    apr_pool_cleanup_register(new->pool, (void *)new, lock_intra_cleanup,
  +                              apr_pool_cleanup_null);
       return APR_SUCCESS;
   }
   
  @@ -112,7 +112,7 @@
   {
       apr_status_t stat;
       if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) {
  -        APR_CLEANUP_REMOVE(lock, lock, lock_intra_cleanup);
  +        apr_pool_cleanup_kill(lock->pool, lock, lock_intra_cleanup);
           return APR_SUCCESS;
       }
       return stat;
  
  
  

Mime
View raw message