X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51496782d13dd083fd20f9db31418b9231f2e5c3..2b7295c9040b15a177a457d3471bda8c2d6ac6bb:/src/msw/utils.cpp 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 }