apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr/shmem/unix shmem.c
Date Mon, 13 Aug 2001 22:46:08 GMT
jerenkrantz    01/08/13 15:46:08

  Modified:    .        buildconf
               include  apr.h.in
               shmem/unix shmem.c
  Log:
  More fallout from MM's departure.
  
  - Fix buildconf to not build MM's configure
  - Add the line in apr.h.in for MAP_ANON mmap usage
  - Fix munmap to have the right parameters
  - Add APR_WANT_MEMFUNC to import memset in shmem.c.
  
  Revision  Changes    Path
  1.19      +2 -1      apr/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr/buildconf,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- buildconf	2001/07/30 04:21:48	1.18
  +++ buildconf	2001/08/13 22:46:07	1.19
  @@ -101,6 +101,7 @@
   ### do some work to toss config.cache?
   autoconf
   
  -(cd shmem/unix/mm && autoconf)
  +# We do not currently use MM
  +#(cd shmem/unix/mm && autoconf)
   
   exit 0
  
  
  
  1.91      +1 -0      apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.h.in,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- apr.h.in	2001/08/13 21:49:08	1.90
  +++ apr.h.in	2001/08/13 22:46:07	1.91
  @@ -66,6 +66,7 @@
   #define APR_USE_SHMEM_MMAP_SHM   @usemmapshm@
   #define APR_USE_SHMEM_MMAP_ZERO  @usemmapzero@
   #define APR_USE_SHMEM_SHMGET     @useshmget@
  +#define APR_USE_SHMEM_MMAP_ANON  @usemmapanon@
   #define APR_USE_SHMEM_BEOS       @usebeosarea@
   
   #define APR_USE_FLOCK_SERIALIZE           @flockser@ 
  
  
  
  1.25      +4 -2      apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/unix/shmem.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- shmem.c	2001/08/13 21:49:08	1.24
  +++ shmem.c	2001/08/13 22:46:08	1.25
  @@ -57,6 +57,8 @@
   #include "apr_lock.h"
   #include "apr_portable.h"
   #include "apr_errno.h"
  +#define APR_WANT_MEMFUNC
  +#include "apr_want.h"
   
   /*
    * This is the Unix implementation of shared memory.
  @@ -200,10 +202,10 @@
   APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shmem_t *m)
   {
   #if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM || APR_USE_SHMEM_MMAP_ZERO
  -    munmap(m->mem);
  +    munmap(m->mem, m->length);
       apr_file_close(m->file);
   #elif APR_USE_SHMEM_MMAP_ANON
  -    munmap(m->mem);
  +    munmap(m->mem, m->length);
   #elif APR_USE_SHMEM_SHMGET
       shmdt(m->mem);
   #elif APR_USE_SHMEM_BEOS
  
  
  

Mime
View raw message