X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fos.h;h=50ff643fd2f536b0a7d7b1f75c3be76528fe8da8;hb=35ab27e7aab71c94aa6be12da15603c7fd87fca8;hp=7efc80da5f681cbe9ab5f1cb60a78b884c62ac41;hpb=f057566fe993f008a9b34dc87b026e7c8ef2611d;p=sbcl.git

diff --git a/src/runtime/os.h b/src/runtime/os.h
index 7efc80d..50ff643 100644
--- a/src/runtime/os.h
+++ b/src/runtime/os.h
@@ -156,12 +156,12 @@ extern void os_deallocate(os_vm_address_t addr, os_vm_size_t len);
  * be functions. */
 
 #define os_trunc_to_page(addr) \
-    (os_vm_address_t)(((long)(addr))&~(os_vm_page_size-1))
+    (os_vm_address_t)(((uword_t)(addr))&~(os_vm_page_size-1))
 #define os_round_up_to_page(addr) \
     os_trunc_to_page((addr)+(os_vm_page_size-1))
 
 #define os_trunc_size_to_page(size) \
-    (os_vm_size_t)(((long)(size))&~(os_vm_page_size-1))
+    (os_vm_size_t)(((uword_t)(size))&~(os_vm_page_size-1))
 #define os_round_up_size_to_page(size) \
     os_trunc_size_to_page((size)+(os_vm_page_size-1))
 
@@ -189,9 +189,14 @@ extern char *os_get_runtime_executable_path(int external_path);
 # define OS_VM_SIZE_FMT "u"
 # define OS_VM_SIZE_FMTX "x"
 #else
+#if defined(LISP_FEATURE_SB_WIN32)
+# define OS_VM_SIZE_FMT "Iu"
+# define OS_VM_SIZE_FMTX "Ix"
+#else
 # define OS_VM_SIZE_FMT "lu"
 # define OS_VM_SIZE_FMTX "lx"
 #endif
+#endif
 
 /* FIXME: this is not the right place for this, but here we have
  * a convenient base type to hand. If it turns out we can just use