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

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 adda6f911c7ac0a3eaecbdb7160df5e881eb9b84..0045ecfe1c3e669464ec91d7143b230cd987a547 100644 (file)
--- 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);
 #if defined(__WIN64__)
     MEMORYSTATUSEX memStatex;
     statex.dwLength = sizeof (statex);

-    GlobalMemoryStatusEx (&statex);
+    ::GlobalMemoryStatusEx (&statex);

     return (wxMemorySize)memStatus.ullAvailPhys;
     return (wxMemorySize)memStatus.ullAvailPhys;

-#elif defined(__WIN32__) && !defined(__BORLANDC__)
+#else /* if defined(__WIN32__) */

     MEMORYSTATUS memStatus;
     memStatus.dwLength = sizeof(MEMORYSTATUS);
     MEMORYSTATUS memStatus;
     memStatus.dwLength = sizeof(MEMORYSTATUS);

-    GlobalMemoryStatus(&memStatus);
+    ::GlobalMemoryStatus(&memStatus);

     return (wxMemorySize)memStatus.dwAvailPhys;
     return (wxMemorySize)memStatus.dwAvailPhys;

-#else
-    return (wxMemorySize)GetFreeSpace(0);

 #endif
 }
 
 #endif
 }