From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 7 Jun 2013 17:17:14 +0000 (+0200)
Subject: updated for version 7.3.1141
X-Git-Tag: v7.3.1141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a238431302ff50f7db401248c4e66b8b298222c2;p=vim

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)
---

diff --git a/src/os_win32.c b/src/os_win32.c
index a975df5d2..e9dbfc5ff 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -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.
diff --git a/src/os_win32.h b/src/os_win32.h
index 6869747aa..ce6f6d493 100644
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -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 */
 
diff --git a/src/version.c b/src/version.c
index a27f1c399..fb110321d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1141,
 /**/
     1140,
 /**/