commit 362dc33835e3ec5d41b7f29d8877da0a9e74c15c
author Bram Moolenaar <Bram@vim.org> Mon Mar 05 21:59:37 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Mar 05 21:59:37 2018 +0100
tree d8bc076dbcc4f0ebe743b0e81bf771dd0e384576
parent 40d77b0ec14a4999d8f0d52643a0ad289bf88dfa

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)

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index 9819176..c28bda0 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -563,7 +563,7 @@
 # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO)
 #  include <sys/sysinfo.h>
 # endif
-# ifdef MACOS_X_DARWIN
+# ifdef MACOS_X
 #  include <mach/mach_host.h>
 #  include <mach/mach_port.h>
 # endif
@@ -578,7 +578,7 @@
     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();

src/version.c

diff --git a/src/version.c b/src/version.c
index 2f045e4..f1a3b95 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1572,
+/**/
     1571,
 /**/
     1570,