changeset 13396:5252ca53093a v8.0.1572

patch 8.0.1572: Mac: getting memory size doesn't work everywhere commit https://github.com/vim/vim/commit/362dc33835e3ec5d41b7f29d8877da0a9e74c15c Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Mon, 05 Mar 2018 22:00:04 +0100
parents 6ec87ec9acab
children 2110b429f0a2
files src/os_unix.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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();
--- 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,