aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.605

Browse Source 
Problem:    MS-Windows: Can't compile with older compilers. (Titov Anatoly)
Solution:   Add #ifdef for MEMORYSTATUSEX.
This commit is contained in:
Bram Moolenaar
2012-07-19 11:37:26 +02:00
parent b5c9cb555e
commit 1a0cee53d4
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/os_win32.c
View File

@@ -4999,7 +4999,20 @@ mch_breakcheck(void)
long_u
mch_avail_mem(int special)
{
if (g_PlatformId != VER_PLATFORM_WIN32_NT)
#ifdef MEMORYSTATUSEX
PlatformId();
if (g_PlatformId == VER_PLATFORM_WIN32_NT)
{
MEMORYSTATUSEX ms;
/* Need to use GlobalMemoryStatusEx() when there is more memory than
* what fits in 32 bits. But it's not always available. */
ms.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&ms);
return (long_u)((ms.ullAvailPhys + ms.ullAvailPageFile) >> 10);
}
else
#endif
{
MEMORYSTATUS ms;
@@ -5007,14 +5020,6 @@ mch_avail_mem(int special)
GlobalMemoryStatus(&ms);
return (long_u)((ms.dwAvailPhys + ms.dwAvailPageFile) >> 10);
}
else
{
MEMORYSTATUSEX ms;
ms.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&ms);
return (long_u)((ms.ullAvailPhys + ms.ullAvailPageFile) >> 10);
}
}
#ifdef FEAT_MBYTE