Merge pull request #651 from JoostK/patch-1

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

diff --git a/support/sys-mman.c b/support/sys-mman.c
index a8463bcb00c2910b89fab4809d4fc665a6014cfe..ce804ef6fb5761f85393591ba8562ca9df08df57 100644 (file)
--- a/support/sys-mman.c
+++ b/support/sys-mman.c
@@ -4,11 +4,22 @@
  * Authors:
  *   Jonathan Pryor (jonpryor@vt.edu)
  *
- * Copyright (C) 2004 Jonathan Pryor
+ * Copyright (C) 2004-2006 Jonathan Pryor
  */
 
+#include <config.h>
+
 #define _XOPEN_SOURCE 600
 
+#ifdef PLATFORM_MACOSX
+/* For mincore () */
+#define _DARWIN_C_SOURCE
+#endif
+#ifdef __FreeBSD__
+/* For mincore () */
+#define __BSD_VISIBLE 1
+#endif
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <errno.h>
@@ -27,7 +38,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 +60,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);
@@ -102,11 +113,11 @@ Mono_Posix_Syscall_mremap (void *old_address, mph_size_t old_size,
 #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, (void*)vec);
 }
 
 #ifdef HAVE_POSIX_MADVISE
@@ -132,7 +143,7 @@ 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;