summaryrefslogtreecommitdiff
path: root/shmem
diff options
context:
space:
mode:
authordreid <dreid@13f79535-47bb-0310-9956-ffa450edef68>2002-01-11 12:16:40 +0000
committerdreid <dreid@13f79535-47bb-0310-9956-ffa450edef68>2002-01-11 12:16:40 +0000
commit06b408ff24265d7d98d0d7c61de20deb68230ffe (patch)
treebbda9ba694eb65cc9bfbfa33d2f140e5b545e2f3 /shmem
parent11266fd541d40a018a04094288c9177c12e5f83c (diff)
downloadlibapr-06b408ff24265d7d98d0d7c61de20deb68230ffe.tar.gz
First step to getting shmem building on beos.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62753 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r--shmem/beos/Makefile.in2
-rw-r--r--shmem/beos/shm.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/shmem/beos/Makefile.in b/shmem/beos/Makefile.in
index 2c8d43640..97214ff5a 100644
--- a/shmem/beos/Makefile.in
+++ b/shmem/beos/Makefile.in
@@ -1,5 +1,5 @@
-TARGETS = shmem.lo
+TARGETS = shm.lo
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
diff --git a/shmem/beos/shm.c b/shmem/beos/shm.c
index a73d36206..2e4928e15 100644
--- a/shmem/beos/shm.c
+++ b/shmem/beos/shm.c
@@ -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 @@ struct apr_shm_t {
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 @@ APR_DECLARE(apr_status_t) apr_shm_init(apr_shmem_t **m, apr_size_t reqsize, cons
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_destroy(apr_shmem_t *m)
}
-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;
}