hrev48297 adds 1 changeset to branch 'master' old head: 29bce877071294445ba4aa055c56dfa893a1a59c new head: 8068b64b5c33e0c8bd6d3fcabfd3ebac3a422d2b overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8068b64+%5E29bce87 ---------------------------------------------------------------------------- 8068b64: Fix build with guarded heap on x86_64 * Type mismatch. [ PulkoMandy <pulkomandy@xxxxxxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev48297 Commit: 8068b64b5c33e0c8bd6d3fcabfd3ebac3a422d2b URL: http://cgit.haiku-os.org/haiku/commit/?id=8068b64 Author: PulkoMandy <pulkomandy@xxxxxxxxxxxxx> Date: Fri Nov 14 11:55:50 2014 UTC ---------------------------------------------------------------------------- 1 file changed, 1 insertion(+), 1 deletion(-) src/system/kernel/vm/vm.cpp | 2 +- ---------------------------------------------------------------------------- diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp index c898786..c67acd8 100644 --- a/src/system/kernel/vm/vm.cpp +++ b/src/system/kernel/vm/vm.cpp @@ -3973,7 +3973,7 @@ vm_init(kernel_args* args) slab_init(args); #if USE_DEBUG_HEAP_FOR_MALLOC || USE_GUARDED_HEAP_FOR_MALLOC - size_t heapSize = INITIAL_HEAP_SIZE; + off_t heapSize = INITIAL_HEAP_SIZE; // try to accomodate low memory systems while (heapSize > sAvailableMemory / 8) heapSize /= 2;