thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.0.1572: Mac: getting memory size doesn't work everywhere

Browse Source 
Problem:    Mac: getting memory size doesn't work everywhere.
Solution:   Use MACOS_X instead of MACOS_X_DARWIN. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2018-03-05 21:59:37 +01:00
parent 40d77b0ec1
commit 362dc33835
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os_unix.c
View File

@ -563,7 +563,7 @@ mch_check_messages(void)
# if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO) # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO)
# include <sys/sysinfo.h> # include <sys/sysinfo.h>
# endif # endif
# ifdef MACOS_X_DARWIN # ifdef MACOS_X
# include <mach/mach_host.h> # include <mach/mach_host.h>
# include <mach/mach_port.h> # include <mach/mach_port.h>
# endif # endif
@ -578,7 +578,7 @@ mch_total_mem(int special UNUSED)
long_u mem = 0; long_u mem = 0;
long_u shiftright = 10; /* how much to shift "mem" right for Kbyte */ 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 */ /* Mac (Darwin) way of getting the amount of RAM available */
mach_port_t host = mach_host_self(); mach_port_t host = mach_host_self();

2
src/version.c
View File

@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1572,
/**/ /**/
1571, 1571,
/**/ /**/