diff --git a/src/os_unix.c b/src/os_unix.c index e0bc3de218..b811ac3f4b 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -603,7 +603,7 @@ mch_total_mem(int special UNUSED) # ifdef MAC_OS_X_VERSION_10_9 + vm_stat.compressor_page_count # endif - ) * getpagesize(); + ) * sysconf(_SC_PAGESIZE); mach_port_deallocate(mach_task_self(), host); } # endif diff --git a/src/version.c b/src/version.c index dc76b4a34a..ce1ed2053c 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1629, /**/ 1628, /**/