gstein 01/02/04 20:37:50
Modified: mmap/unix mmap.c
Log:
apr_mmap_t is defined as a void*.
(caddr_t seems to be a BSDism rather than single unix)
Revision Changes Path
1.31 +5 -5 apr/mmap/unix/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apr/mmap/unix/mmap.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -u -r1.30 -r1.31
--- mmap.c 2001/01/29 19:01:25 1.30
+++ mmap.c 2001/02/05 04:37:50 1.31
@@ -87,14 +87,14 @@
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 @@
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 @@
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 rv;
- if (mmap->mm == (caddr_t) -1)
+ if (mmap->mm == (void *)-1)
return APR_ENOENT;
if ((rv = mmap_cleanup(mmap)) == APR_SUCCESS) {
