You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by dr...@apache.org on 2002/01/11 13:16:40 UTC

cvs commit: apr/shmem/beos Makefile.in shm.c

dreid       02/01/11 04:16:40

  Modified:    shmem/beos Makefile.in shm.c
  Log:
  First step to getting shmem building on beos.
  
  Revision  Changes    Path
  1.2       +1 -1      apr/shmem/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/shmem/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	30 Apr 2001 20:55:17 -0000	1.1
  +++ Makefile.in	11 Jan 2002 12:16:40 -0000	1.2
  @@ -1,5 +1,5 @@
   
  -TARGETS = shmem.lo
  +TARGETS = shm.lo
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.2       +6 -6      apr/shmem/beos/shm.c
  
  Index: shm.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/beos/shm.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- shm.c	10 Jan 2002 00:20:06 -0000	1.1
  +++ shm.c	11 Jan 2002 12:16:40 -0000	1.2
  @@ -53,7 +53,7 @@
    */
   
   #include "apr_general.h"
  -#include "apr_shmem.h"
  +#include "apr_shm.h"
   #include "apr_errno.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
  @@ -69,14 +69,14 @@
       area_id aid;
   };
   
  -APR_DECLARE(apr_status_t) apr_shm_init(apr_shmem_t **m, apr_size_t reqsize, const char *file, 
  +APR_DECLARE(apr_status_t) apr_shm_init(apr_shm_t **m, apr_size_t reqsize, const char *file, 
                                          apr_pool_t *p)
   {
       apr_size_t pagesize;
       area_id newid;
       char *addr;
   
  -    (*m) = (apr_shmem_t *)apr_pcalloc(p, sizeof(apr_shmem_t));
  +    (*m) = (apr_shm_t *)apr_pcalloc(p, sizeof(apr_shm_t));
       /* we MUST allocate in pages, so calculate how big an area we need... */
       pagesize = ((reqsize + B_PAGE_SIZE - 1) / B_PAGE_SIZE) * B_PAGE_SIZE;
       
  @@ -95,7 +95,7 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shmem_t *m)
  +APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
   {
       delete_area(m->aid);
       m->avail = 0;
  @@ -104,14 +104,14 @@
   }
   
   
  -APR_DECLARE(apr_status_t) apr_shm_attach(apr_shmem_t **m,
  +APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
                                            const char *filename,
                                            apr_pool_t *pool)
   {
       return APR_ENOTIMPL;
   }
   
  -APR_DECLARE(apr_status_t) apr_shm_detach(apr_shmem_t *m)
  +APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m)
   {
       return APR_ENOTIMPL;
   }