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

ENH: try to fix hp and vs 6, again...

Browse Source
This commit is contained in:
Bill Hoffman 2008-01-31 21:33:32 -05:00
parent 5a36673807
commit cc7c89ca51
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/kwsys/SystemInformation.cxx
View File

@ -125,7 +125,7 @@ public:
void RunCPUCheck(); void RunCPUCheck();
void RunOSCheck(); void RunOSCheck();
void RunMemoryCheck(); void RunMemoryCheck();
private: public:
#define VENDOR_STRING_LENGTH (12 + 1) #define VENDOR_STRING_LENGTH (12 + 1)
#define CHIPNAME_STRING_LENGTH (48 + 1) #define CHIPNAME_STRING_LENGTH (48 + 1)
#define SERIALNUMBER_STRING_LENGTH (29 + 1) #define SERIALNUMBER_STRING_LENGTH (29 + 1)
@ -389,15 +389,15 @@ unsigned long SystemInformation::GetAvailablePhysicalMemory()
/** Run the different checks */ /** Run the different checks */
void SystemInformation::RunCPUCheck() void SystemInformation::RunCPUCheck()
{ {
return this->Implementation->RunCPUCheck(); this->Implementation->RunCPUCheck();
} }
void SystemInformation::RunOSCheck() void SystemInformation::RunOSCheck()
{ {
return this->Implementation->RunOSCheck(); this->Implementation->RunOSCheck();
} }
void SystemInformation::RunMemoryCheck() void SystemInformation::RunMemoryCheck()
{ {
return this->Implementation->RunMemoryCheck(); this->Implementation->RunMemoryCheck();
} }
@ -2947,7 +2947,7 @@ bool SystemInformationImplementation::QueryOSInformation()
{ {
this->OSRelease = "XP"; this->OSRelease = "XP";
} }
#ifdef VER_NT_WORKSTATION
// Test for product type. // Test for product type.
if (bOsVersionInfoEx) if (bOsVersionInfoEx)
{ {
@ -2990,8 +2990,9 @@ bool SystemInformationImplementation::QueryOSInformation()
sprintf (operatingSystem, "%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); sprintf (operatingSystem, "%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem; this->OSVersion = operatingSystem;
} }
else else
#endif // VER_NT_WORKSTATION
{ {
HKEY hKey; HKEY hKey;
char szProductType[80]; char szProductType[80];