kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix build on vs6

This commit is contained in:
Bill Hoffman 2008-05-02 17:22:46 -04:00
parent 9c63132c3c
commit 47fa89b6e9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/kwsys/SystemInformation.cxx
View File

@ -2228,13 +2228,19 @@ int SystemInformationImplementation::QueryMemory()
#ifdef __CYGWIN__ #ifdef __CYGWIN__
return 0; return 0;
#elif _WIN32 #elif _WIN32
#if _MSC_VER < 1300
MEMORYSTATUS ms;
#define MEM_VAL(value) dw##value
#else
MEMORYSTATUSEX ms; MEMORYSTATUSEX ms;
#define MEM_VAL(value) ull##value
#endif
GlobalMemoryStatusEx(&ms); GlobalMemoryStatusEx(&ms);
unsigned long tv = ms.ullTotalVirtual; unsigned long tv = ms.MEM_VAL(TotalVirtual);
unsigned long tp = ms.ullTotalPhys; unsigned long tp = ms.MEM_VAL(TotalPhys);
unsigned long av = ms.ullAvailVirtual; unsigned long av = ms.MEM_VAL(AvailVirtual);
unsigned long ap = ms.ullAvailPhys; unsigned long ap = ms.MEM_VAL(AvailPhys);
this->TotalVirtualMemory = tv>>10>>10; this->TotalVirtualMemory = tv>>10>>10;
this->TotalPhysicalMemory = tp>>10>>10; this->TotalPhysicalMemory = tp>>10>>10;
this->AvailableVirtualMemory = av>>10>>10; this->AvailableVirtualMemory = av>>10>>10;