Return-Path: Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 67941 invoked by uid 500); 7 Jan 2002 05:15:31 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Delivered-To: moderator for dev@apr.apache.org Received: (qmail 6485 invoked from network); 5 Jan 2002 11:58:45 -0000 From: "Craig Peterein" Date: Sat, 5 Jan 2002 05:58:44 -0600 To: dev@apr.apache.org Subject: [PATCH] make apr and apr-util compile Message-ID: <20020105115844.GA26523@puma.peterein.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.25i X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N I'm not on this list, so please cc me. (apr/shmem/beos/shmem.c apr/shmem/os2/shmem.c apr/shmem/unix/shmem.c) Fix so they compile. The typedef for apr_shmem_t is already in include/apr_shmem.h (apr-util/include/apr_rmm.h) Fix typo. shm -> rmm (apr-util/misc/apr_rmm.c) Fix so it compiles. The typedef for apr_rmm_t is already in include/apr_rmm.h Index: apr/shmem/beos/shmem.c =================================================================== RCS file: /home/cvspublic/apr/shmem/beos/shmem.c,v retrieving revision 1.6 diff -u -r1.6 shmem.c --- apr/shmem/beos/shmem.c 5 Jan 2002 08:03:53 -0000 1.6 +++ apr/shmem/beos/shmem.c 5 Jan 2002 11:37:04 -0000 @@ -69,7 +69,7 @@ void *prev; }; -typedef struct apr_shmem_t { +struct apr_shmem_t { apr_pool_t *p; void *memblock; void *ptr; @@ -77,7 +77,7 @@ area_id aid; struct block_t *uselist; struct block_t *freelist; -} apr_shmem_t; +}; #define MIN_BLK_SIZE 128 Index: apr/shmem/os2/shmem.c =================================================================== RCS file: /home/cvspublic/apr/shmem/os2/shmem.c,v retrieving revision 1.13 diff -u -r1.13 shmem.c --- apr/shmem/os2/shmem.c 5 Jan 2002 08:03:53 -0000 1.13 +++ apr/shmem/os2/shmem.c 5 Jan 2002 11:37:04 -0000 @@ -60,10 +60,10 @@ #include #include -typedef struct apr_shmem_t { +struct apr_shmem_t { void *memblock; Heap_t heap; -} apr_shmem_t; +}; Index: apr/shmem/unix/shmem.c =================================================================== RCS file: /home/cvspublic/apr/shmem/unix/shmem.c,v retrieving revision 1.35 diff -u -r1.35 shmem.c --- apr/shmem/unix/shmem.c 5 Jan 2002 08:03:53 -0000 1.35 +++ apr/shmem/unix/shmem.c 5 Jan 2002 11:37:04 -0000 @@ -89,7 +89,7 @@ #include #endif -typedef struct apr_shmem_t { +struct apr_shmem_t { void *mem; void *curmem; apr_size_t length; @@ -104,7 +104,7 @@ #elif APR_USE_SHMEM_BEOS area_id areaid; #endif -} apr_shmem_t; +}; APR_DECLARE(apr_status_t) apr_shm_init(apr_shmem_t **m, apr_size_t reqsize, const char *filename, apr_pool_t *pool) Index: apr-util/include/apr_rmm.h =================================================================== RCS file: /home/cvspublic/apr-util/include/apr_rmm.h,v retrieving revision 1.1 diff -u -r1.1 apr_rmm.h --- apr-util/include/apr_rmm.h 5 Jan 2002 07:14:29 -0000 1.1 +++ apr-util/include/apr_rmm.h 5 Jan 2002 11:37:04 -0000 @@ -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. Index: apr-util/misc/apr_rmm.c =================================================================== RCS file: /home/cvspublic/apr-util/misc/apr_rmm.c,v retrieving revision 1.1 diff -u -r1.1 apr_rmm.c --- apr-util/misc/apr_rmm.c 5 Jan 2002 07:14:29 -0000 1.1 +++ apr-util/misc/apr_rmm.c 5 Jan 2002 11:37:04 -0000 @@ -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 -- Craig Peterein -- craig dot peterein at myrealbox dot com "as we enjoy great advantages from the inventions of others, we should be glad of an opportunity to serve others by any invention of ours; and this we should do freely and generously." -- Benjamin Franklin