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

ENH: fixes for borland

This commit is contained in:
Bill Hoffman 2008-01-31 16:37:52 -05:00
parent 70e9412dc7
commit 294dca62ee
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/kwsys/SystemInformation.cxx
View File

@ -2581,7 +2581,7 @@ int SystemInformationImplementation::CPUCount()
// Calculate the appropriate shifts and mask based on the // Calculate the appropriate shifts and mask based on the
// number of logical processors. // number of logical processors.
unsigned char i = 1; unsigned int i = 1;
unsigned char PHY_ID_MASK = 0xFF; unsigned char PHY_ID_MASK = 0xFF;
unsigned char PHY_ID_SHIFT = 0; unsigned char PHY_ID_SHIFT = 0;
@ -2614,12 +2614,11 @@ int SystemInformationImplementation::CPUCount()
if (SetProcessAffinityMask(hCurrentProcessHandle, if (SetProcessAffinityMask(hCurrentProcessHandle,
dwAffinityMask)) dwAffinityMask))
{ {
unsigned char APIC_ID, LOG_ID, PHY_ID; unsigned char APIC_ID, LOG_ID;
Sleep(0); // Give OS time to switch CPU Sleep(0); // Give OS time to switch CPU
APIC_ID = GetAPICId(); APIC_ID = GetAPICId();
LOG_ID = APIC_ID & ~PHY_ID_MASK; LOG_ID = APIC_ID & ~PHY_ID_MASK;
PHY_ID = APIC_ID >> PHY_ID_SHIFT;
if (LOG_ID != 0) if (LOG_ID != 0)
{ {
@ -2791,7 +2790,7 @@ kwsys_stl::string SystemInformationImplementation::RunProcess(kwsys_stl::vector<
} break; } break;
} }
kwsysProcess_Delete(gp); kwsysProcess_Delete(gp);
(void)result;
return buffer; return buffer;
} }
@ -2954,6 +2953,8 @@ bool SystemInformationImplementation::QueryOSInformation()
{ {
if (osvi.wProductType == VER_NT_WORKSTATION) if (osvi.wProductType == VER_NT_WORKSTATION)
{ {
// VER_SUITE_PERSONAL may not be defined
#ifdef VER_SUITE_PERSONAL
if (osvi.wSuiteMask & VER_SUITE_PERSONAL) if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
{ {
this->OSRelease += " Personal"; this->OSRelease += " Personal";
@ -2962,6 +2963,7 @@ bool SystemInformationImplementation::QueryOSInformation()
{ {
this->OSRelease += " Professional"; this->OSRelease += " Professional";
} }
#endif
} }
else if (osvi.wProductType == VER_NT_SERVER) else if (osvi.wProductType == VER_NT_SERVER)
{ {