Rename StackSlotType to GCSlotType.

[mono.git] / support / sys-mman.c

diff --git a/support/sys-mman.c b/support/sys-mman.c
index 22ee678217a80007897450aabf5518330cce8897..346c97d6df61c8f36b67428ab2907bdf8d57c2cc 100644 (file)
--- a/support/sys-mman.c
+++ b/support/sys-mman.c
@@ -4,7 +4,7 @@
  * Authors:
  *   Jonathan Pryor (jonpryor@vt.edu)
  *
- * Copyright (C) 2004 Jonathan Pryor
+ * Copyright (C) 2004-2006 Jonathan Pryor
  */
 
 #define _XOPEN_SOURCE 600
@@ -27,7 +27,7 @@ Mono_Posix_Syscall_mmap (void *start, mph_size_t length, int prot, int flags,
        mph_return_val_if_size_t_overflow (length, MAP_FAILED);
        mph_return_val_if_off_t_overflow (offset, MAP_FAILED);
 
-       if (Mono_Posix_FromMmapProt (prot, &_prot) == -1)
+       if (Mono_Posix_FromMmapProts (prot, &_prot) == -1)
                return MAP_FAILED;
        if (Mono_Posix_FromMmapFlags (flags, &_flags) == -1)
                return MAP_FAILED;
@@ -49,7 +49,7 @@ Mono_Posix_Syscall_mprotect (void *start, mph_size_t len, int prot)
        int _prot;
        mph_return_if_size_t_overflow (len);
 
-       if (Mono_Posix_FromMmapProt (prot, &_prot) == -1)
+       if (Mono_Posix_FromMmapProts (prot, &_prot) == -1)
                return -1;
 
        return mprotect (start, (size_t) len, _prot);
@@ -83,6 +83,7 @@ Mono_Posix_Syscall_munlock (void *start, mph_size_t len)
        return munlock (start, (size_t) len);
 }
 
+#ifdef HAVE_MREMAP
 void*
 Mono_Posix_Syscall_mremap (void *old_address, mph_size_t old_size, 
                mph_size_t new_size, guint64 flags)
@@ -98,13 +99,14 @@ Mono_Posix_Syscall_mremap (void *old_address, mph_size_t old_size,
        return mremap (old_address, (size_t) old_size, (size_t) new_size,
                        (unsigned long) _flags);
 }
+#endif /* def HAVE_MREMAP */
 
 int
-Mono_Posix_Syscall_mincore (void *start, mph_size_t length, void *vec)
+Mono_Posix_Syscall_mincore (void *start, mph_size_t length, unsigned char *vec)
 {
        mph_return_if_size_t_overflow (length);
 
-       return mincore (start, (size_t) length, (unsigned char*) vec);
+       return mincore (start, (size_t) length, vec);
 }
 
 #ifdef HAVE_POSIX_MADVISE
@@ -120,6 +122,7 @@ Mono_Posix_Syscall_posix_madvise (void *addr, mph_size_t len, gint32 advice)
 }
 #endif /* def HAVE_POSIX_MADVISE */
 
+#ifdef HAVE_REMAP_FILE_PAGES
 int
 Mono_Posix_Syscall_remap_file_pages (void *start, mph_size_t size, 
                int prot, mph_ssize_t pgoff, int flags)
@@ -129,13 +132,14 @@ Mono_Posix_Syscall_remap_file_pages (void *start, mph_size_t size,
        mph_return_if_size_t_overflow (size);
        mph_return_if_ssize_t_overflow (pgoff);
 
-       if (Mono_Posix_FromMmapProt (prot, &_prot) == -1)
+       if (Mono_Posix_FromMmapProts (prot, &_prot) == -1)
                return -1;
        if (Mono_Posix_FromMmapFlags (flags, &_flags) == -1)
                return -1;
 
        return remap_file_pages (start, (size_t) size, _prot, (ssize_t) pgoff, _flags);
 }
+#endif /* def HAVE_REMAP_FILE_PAGES */
 
 G_END_DECLS