From 1ce285686b342a69659ce016c4d7ca198eff1524 Mon Sep 17 00:00:00 2001 From: Greg Stein Date: Mon, 5 Feb 2001 04:37:50 +0000 Subject: apr_mmap_t is defined as a void*. (caddr_t seems to be a BSDism rather than single unix) git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61187 13f79535-47bb-0310-9956-ffa450edef68 --- mmap/unix/mmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mmap') diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index 34f7c2bb6..948fc680a 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -87,14 +87,14 @@ static apr_status_t mmap_cleanup(void *themmap) rv = delete_area(mm->area); if (rv == 0) { - mm->mm = (caddr_t)-1; + mm->mm = (void *)-1; return APR_SUCCESS; } #else rv = munmap(mm->mm, mm->size); if (rv == 0) { - mm->mm = (caddr_t)-1; + mm->mm = (void *)-1; return APR_SUCCESS; } #endif @@ -111,7 +111,7 @@ apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, area_id aid = -1; uint32 pages = 0; #else - caddr_t mm; + void *mm; #endif if (file == NULL || file->filedes == -1 || file->buffered) @@ -155,7 +155,7 @@ apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, mm = mmap(NULL, size, PROT_READ, MAP_SHARED, file->filedes, offset); - if (mm == (caddr_t)-1) { + if (mm == (void *)-1) { /* we failed to get an mmap'd file... */ return APR_ENOMEM; } @@ -175,7 +175,7 @@ apr_status_t apr_mmap_delete(apr_mmap_t *mmap) { apr_status_t rv; - if (mmap->mm == (caddr_t) -1) + if (mmap->mm == (void *)-1) return APR_ENOENT; if ((rv = mmap_cleanup(mmap)) == APR_SUCCESS) { -- cgit v1.2.1