mirror of
https://github.com/vim/vim.git
synced 2025-09-06 21:53:38 -04:00
updated for version 7.3.1141
Problem: Win32: Check for available memory is not reliable and adds overhead. Solution: Remove mch_avail_mem(). (Mike Williams)
This commit is contained in:
parent
43e0298416
commit
a238431302
@ -5048,37 +5048,6 @@ mch_breakcheck(void)
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* How much memory is available in Kbyte?
|
||||
* Return sum of available physical and page file memory.
|
||||
*/
|
||||
/*ARGSUSED*/
|
||||
long_u
|
||||
mch_avail_mem(int special)
|
||||
{
|
||||
#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;
|
||||
|
||||
ms.dwLength = sizeof(MEMORYSTATUS);
|
||||
GlobalMemoryStatus(&ms);
|
||||
return (long_u)((ms.dwAvailPhys + ms.dwAvailPageFile) >> 10);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef FEAT_MBYTE
|
||||
/*
|
||||
* Same code as below, but with wide functions and no comments.
|
||||
|
@ -80,7 +80,6 @@
|
||||
#ifndef FEAT_GUI_W32 /* GUI works different */
|
||||
# define BREAKCHECK_SKIP 1 /* call mch_breakcheck() each time, it's fast */
|
||||
#endif
|
||||
#define HAVE_AVAIL_MEM
|
||||
|
||||
#define HAVE_PUTENV /* at least Bcc 5.2 and MSC have it */
|
||||
|
||||
|
@ -728,6 +728,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1141,
|
||||
/**/
|
||||
1140,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user