# HG changeset patch # User Christian Brabandt # Date 1520283604 -3600 # Node ID 5252ca53093a9ffaebc0945b476f2a2eec96efc0 # Parent 6ec87ec9acab4317247ca8a0ccd41a9533e4c4c6 patch 8.0.1572: Mac: getting memory size doesn't work everywhere commit https://github.com/vim/vim/commit/362dc33835e3ec5d41b7f29d8877da0a9e74c15c Author: Bram Moolenaar Date: Mon Mar 5 21:59:37 2018 +0100 patch 8.0.1572: Mac: getting memory size doesn't work everywhere Problem: Mac: getting memory size doesn't work everywhere. Solution: Use MACOS_X instead of MACOS_X_DARWIN. (Kazunobu Kuriyama) diff --git a/src/os_unix.c b/src/os_unix.c --- a/src/os_unix.c +++ b/src/os_unix.c @@ -563,7 +563,7 @@ mch_check_messages(void) # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO) # include # endif -# ifdef MACOS_X_DARWIN +# ifdef MACOS_X # include # include # endif @@ -578,7 +578,7 @@ mch_total_mem(int special UNUSED) long_u mem = 0; long_u shiftright = 10; /* how much to shift "mem" right for Kbyte */ -# ifdef MACOS_X_DARWIN +# ifdef MACOS_X { /* Mac (Darwin) way of getting the amount of RAM available */ mach_port_t host = mach_host_self(); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1572, +/**/ 1571, /**/ 1570,