cvs commit: apr-util/misc apr_rmm.c

[tr...@apache.org]

trawick     02/01/05 05:44:12

  Modified:    include  apr_rmm.h
               misc     apr_rmm.c
  Log:
  get relocatable-managed-memory stuff to compile
  
  Revision  Changes    Path
  1.2       +1 -1      apr-util/include/apr_rmm.h
  
  Index: apr_rmm.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_rmm.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_rmm.h	5 Jan 2002 07:14:29 -0000	1.1
  +++ apr_rmm.h	5 Jan 2002 13:44:11 -0000	1.2
  @@ -93,7 +93,7 @@
    * Destroy a managed memory block.
    * @param rmm The relocatable memory block to destroy
    */
  -APU_DECLARE(apr_status_t) apr_shm_destroy(apr_rmm_t *rmm);
  +APU_DECLARE(apr_status_t) apr_rmm_destroy(apr_rmm_t *rmm);
   
   /**
    * Attach to a relocatable memory block already managed by the apr_rmm API.
  
  
  
  1.2       +3 -3      apr-util/misc/apr_rmm.c
  
  Index: apr_rmm.c
  ===================================================================
  RCS file: /home/cvs/apr-util/misc/apr_rmm.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_rmm.c	5 Jan 2002 07:14:29 -0000	1.1
  +++ apr_rmm.c	5 Jan 2002 13:44:11 -0000	1.2
  @@ -72,11 +72,11 @@
       apr_rmm_off_t /* rmm_block_t */ firstfree;
   } rmm_hdr_block_t;
   
  -typedef struct apr_rmm_t {
  +struct apr_rmm_t {
       apr_pool_t *p;
       rmm_hdr_block_t *base;
       apr_size_t size;
  -} apr_rmm_t;
  +};
   
   #define MIN_BLK_SIZE 128
   
  @@ -151,7 +151,7 @@
       return 0;
   }
   
  -void move_block(apr_rmm_t *rmm, apr_rmm_off_t this, int free)
  +static void move_block(apr_rmm_t *rmm, apr_rmm_off_t this, int free)
   {   
       struct rmm_block_t *blk = (rmm_block_t*)((char*)rmm->base + this);