diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-05 21:59:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-05 21:59:37 +0100 |
| commit | 362dc33835e3ec5d41b7f29d8877da0a9e74c15c (patch) | |
| tree | d8bc076dbcc4f0ebe743b0e81bf771dd0e384576 | |
| parent | 40d77b0ec14a4999d8f0d52643a0ad289bf88dfa (diff) | |
| download | vim-git-8.0.1572.tar.gz | |
patch 8.0.1572: Mac: getting memory size doesn't work everywherev8.0.1572
Problem: Mac: getting memory size doesn't work everywhere.
Solution: Use MACOS_X instead of MACOS_X_DARWIN. (Kazunobu Kuriyama)
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 9819176b5..c28bda0aa 100644 --- 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 2f045e4fd..f1a3b950c 100644 --- 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, |