mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
revert last change, instead set define to say we support win2000 and up
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27035 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
efd8093546
commit
54f80c3b76
3 changed files with 3 additions and 14 deletions
|
@ -45,6 +45,9 @@
|
|||
#endif
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#include <w32api.h>
|
||||
#define _WIN32_WINNT Windows2000
|
||||
#define WINVER Windows2000
|
||||
#include <windows.h>
|
||||
#define GNUSTEP_BASE_SOCKET_MESSAGE (WM_USER + 1)
|
||||
#endif
|
||||
|
|
|
@ -140,18 +140,11 @@ NSRealMemoryAvailable ()
|
|||
return 0;
|
||||
return info.freeram;
|
||||
#elif defined(__MINGW32__)
|
||||
#if (_WIN32_WINNT >= 0x0500)
|
||||
MEMORYSTATUSEX memory;
|
||||
|
||||
memory.dwLength = sizeof(memory);
|
||||
GlobalMemoryStatusEx(&memory);
|
||||
return memory.ullAvailPhys;
|
||||
#else
|
||||
MEMORYSTATUS memory;
|
||||
|
||||
GlobalMemoryStatus(&memory);
|
||||
return memory.dwAvailPhys;
|
||||
#endif
|
||||
#elif defined(__BEOS__)
|
||||
system_info info;
|
||||
|
||||
|
|
|
@ -1277,18 +1277,11 @@ static void determineOperatingSystem()
|
|||
if (beenHere == NO)
|
||||
{
|
||||
#if defined(__MINGW32__)
|
||||
#if (_WIN32_WINNT >= 0x0500)
|
||||
MEMORYSTATUSEX memory;
|
||||
|
||||
memory.dwLength = sizeof(memory);
|
||||
GlobalMemoryStatusEx(&memory);
|
||||
return memory.ullTotalPhys;
|
||||
#else
|
||||
MEMORYSTATUS memory;
|
||||
|
||||
GlobalMemoryStatus(&memory);
|
||||
return memory.dwTotalPhys;
|
||||
#endif
|
||||
#elif defined(_SC_PHYS_PAGES)
|
||||
availMem = sysconf(_SC_PHYS_PAGES) * NSPageSize();
|
||||
#elif defined(HAVE_PROCFS)
|
||||
|
|
Loading…
Reference in a new issue