* 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))
# 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