vim: src/os_win32.c comparison

updated for version 7.3.605 Problem: MS-Windows: Can't compile with older compilers. (Titov Anatoly) Solution: Add #ifdef for MEMORYSTATUSEX.

comparison

equal deleted inserted replaced

-:942df3a8051b
+:4873d9c4ad3b
 */
 /*ARGSUSED*/
 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;
 	ms.dwLength = sizeof(MEMORYSTATUS);
 	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
 /*

Mercurial > vim