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
index 9819176b57306c5669bf443f95f148ed8dbe46d4..c28bda0aad5ee90d01eae6148a05edcc64beb073 100644 (file)
--- 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 <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 @@ 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
index 2f045e4fd3decaf261b4c395b68ac8a265552fc5..f1a3b950c16e5a18dd0d02eedbf0a5b17d29c224 100644 (file)
--- 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 */
+/**/
+    1572,
 /**/
     1571,
 /**/