Few changes that actually get us building well enough for apache. More to

follow.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62754 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 4 deletions

diff --git a/shmem/beos/shm.c b/shmem/beos/shm.c
index 2e4928e15..16f292d61 100644
--- a/shmem/beos/shm.c
+++ b/shmem/beos/shm.c
@@ -65,12 +65,15 @@ struct apr_shm_t {
     apr_pool_t *p;
     void *memblock;
     void *ptr;
+    apr_size_t reqsize;
     apr_size_t avail;
     area_id aid;
 };
 
-APR_DECLARE(apr_status_t) apr_shm_init(apr_shm_t **m, apr_size_t reqsize, const char *file, 
-                                       apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, 
+                                         apr_size_t reqsize, 
+                                         const char *file, 
+                                         apr_pool_t *p)
 {
     apr_size_t pagesize;
     area_id newid;
@@ -91,6 +94,7 @@ APR_DECLARE(apr_status_t) apr_shm_init(apr_shm_t **m, apr_size_t reqsize, const
     (*m)->memblock = addr;
     (*m)->ptr = (void*)addr;
     (*m)->avail = pagesize; /* record how big an area we actually created... */
+    (*m)->reqsize = reqsize;
 
     return APR_SUCCESS;
 }
@@ -118,11 +122,11 @@ APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m)
 
 APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m)
 {
-    return APR_ENOTIMPL;
+    return m->memblock;
 }
 
 APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
 {
-    return APR_ENOTIMPL;
+    return m->reqsize;
 }