RTS tidyup sweep, first phase

[ghc-hetmet.git] / rts / posix / OSMem.c

diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index bdae273..0a37256 100644 (file)
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -6,12 +6,12 @@
  *
  * ---------------------------------------------------------------------------*/
 
-/* This is non-posix compliant. */
-/* #include "PosixSource.h" */
+// This is non-posix compliant.
+// #include "PosixSource.h"
 
 #include "Rts.h"
-#include "OSMem.h"
-#include "RtsFlags.h"
+
+#include "sm/OSMem.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -138,7 +138,7 @@ static void *
 gen_map_mblocks (lnat size)
 {
     int slop;
-    void *ret;
+    StgWord8 *ret;
 
     // Try to map a larger block, and take the aligned portion from
     // it (unmap the rest).
@@ -237,6 +237,6 @@ void setExecutable (void *p, lnat len, rtsBool exec)
     StgWord size             = startOfLastPage - startOfFirstPage + pageSize;
     if (mprotect((void*)startOfFirstPage, (size_t)size, 
                 (exec ? PROT_EXEC : 0) | PROT_READ | PROT_WRITE) != 0) {
-       barf("makeExecutable: failed to protect 0x%p\n", p);
+       barf("setExecutable: failed to protect 0x%p\n", p);
     }
 }