From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 27 Dec 2004 20:17:44 +0000 (+0000)
Subject: GetFreeSpace is here since 1993 and returns crazy values. Let's have win64/win32... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2b7295c9040b15a177a457d3471bda8c2d6ac6bb

GetFreeSpace is here since 1993 and returns crazy values. Let's have win64/win32 cases only.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index adda6f911c..0045ecfe1c 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1015,15 +1015,13 @@ wxMemorySize wxGetFreeMemory()
 #if defined(__WIN64__)
     MEMORYSTATUSEX memStatex;
     statex.dwLength = sizeof (statex);
-    GlobalMemoryStatusEx (&statex);
+    ::GlobalMemoryStatusEx (&statex);
     return (wxMemorySize)memStatus.ullAvailPhys;
-#elif defined(__WIN32__) && !defined(__BORLANDC__)
+#else /* if defined(__WIN32__) */
     MEMORYSTATUS memStatus;
     memStatus.dwLength = sizeof(MEMORYSTATUS);
-    GlobalMemoryStatus(&memStatus);
+    ::GlobalMemoryStatus(&memStatus);
     return (wxMemorySize)memStatus.dwAvailPhys;
-#else
-    return (wxMemorySize)GetFreeSpace(0);
 #endif
 }