From 0e127d4aa8bd7b271ab0757a49efee24df22d5cb Mon Sep 17 00:00:00 2001 From: Isaiah Norton <isaiah.norton@gmail.com> Date: Fri, 3 Apr 2015 21:55:53 -0400 Subject: [PATCH] Fix the build on windows --- src/gc.c | 2 +- src/sys.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gc.c b/src/gc.c index 92912b052f88c..640d0fe473f50 100644 --- a/src/gc.c +++ b/src/gc.c @@ -575,10 +575,10 @@ static NOINLINE void *malloc_page(void) while(region_i < REGION_COUNT) { region = regions[region_i]; if (region == NULL) { + size_t alloc_size = sizeof(region_t); #ifdef _OS_WINDOWS_ char* mem = (char*)VirtualAlloc(NULL, sizeof(region_t) + GC_PAGE_SZ, MEM_RESERVE, PAGE_READWRITE); #else - size_t alloc_size = sizeof(region_t); if (GC_PAGE_SZ > system_page_size) alloc_size += GC_PAGE_SZ; char* mem = (char*)mmap(0, alloc_size, PROT_READ | PROT_WRITE, MAP_NORESERVE | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); diff --git a/src/sys.c b/src/sys.c index e9526fe2b2f40..ec8db671304b6 100644 --- a/src/sys.c +++ b/src/sys.c @@ -500,7 +500,7 @@ DLLEXPORT void jl_field_offsets(jl_datatype_t *dt, ssize_t *offsets) static long cachedPagesize = 0; long jl_getpagesize(void) { - if (!chachedPagesize) { + if (!cachedPagesize) { SYSTEM_INFO systemInfo; GetSystemInfo (&systemInfo); cachedPagesize = systemInfo.dwPageSize;