Merge branch 'master' of git://factorcode.org/git/factor

vm/layouts.hpp

@@ -28,11 +28,6 @@ inline static cell align8(cell a)
 	return align(a,8);
 }
 
-inline static cell align_page(cell a)
-{
-	return align(a,getpagesize());
-}
-
 #define WORD_SIZE (signed)(sizeof(cell)*8)
 
 #define TAG_MASK 7

vm/math.cpp

@@ -461,7 +461,7 @@ VM_C_API s64 to_signed_8(cell obj)
 
 VM_C_API void box_unsigned_8(u64 n)
 {
-	if(n > fixnum_max)
+	if(n > (u64)fixnum_max)
 		dpush(tag<bignum>(ulong_long_to_bignum(n)));
 	else
 		dpush(tag_fixnum(n));

vm/segments.hpp

@@ -7,4 +7,9 @@ struct segment {
 	cell end;
 };
 
+inline static cell align_page(cell a)
+{
+	return align(a,getpagesize());
+}
+
 }