diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2016-03-29 18:28:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-29 18:29:42 (GMT) |
| commit | 735c41ddb021a5ca0e8957591447acdb28a0f41b (patch) | |
| tree | 82909b933a16bafcc760807a3481d04b1f5d6053 /SystemInformation.cxx | |
| parent | cd4fef3041be85e1ec9139a91efa8a96f74707c5 (diff) | |
| download | CMake-735c41ddb021a5ca0e8957591447acdb28a0f41b.zip CMake-735c41ddb021a5ca0e8957591447acdb28a0f41b.tar.gz CMake-735c41ddb021a5ca0e8957591447acdb28a0f41b.tar.bz2 | |
KWSys 2016-03-29 (b51abb30)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit b51abb307d3b40957cc508aa54d449d9b41f5537 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
069a6b37 windows: check for _WIN32 rather than WIN32
Felix Geyer (1):
b51abb30 SystemInformation: Fix spelling typos in comments
Diffstat (limited to 'SystemInformation.cxx')
| -rw-r--r-- | SystemInformation.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 512d5fb..81fb2f9 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -1583,7 +1583,7 @@ SystemInformationImplementation::~SystemInformationImplementation() void SystemInformationImplementation::RunCPUCheck() { -#ifdef WIN32 +#ifdef _WIN32 // Check to see if this processor supports CPUID. bool supportsCPUID = DoesCPUSupportCPUID(); @@ -2056,7 +2056,7 @@ bool SystemInformationImplementation::DoesCPUSupportFeature(long int dwFeature) void SystemInformationImplementation::Delay(unsigned int uiMS) { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER Frequency, StartCounter, EndCounter; __int64 x; @@ -2339,7 +2339,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails() case 13: TLBCacheUnit = ((TLBCacheData[3] & 0x00FF0000) >> 16); break; case 14: TLBCacheUnit = ((TLBCacheData[3] & 0xFF000000) >> 24); break; - // Default case - an error has occured. + // Default case - an error has occurred. default: return false; } @@ -2401,7 +2401,7 @@ bool SystemInformationImplementation::RetrieveClassicalCPUCacheDetails() case 0x96: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only case 0x9b: STORE_TLBCACHE_INFO (TLBCode, 262144); break; // <-- FIXME: IA-64 Only - // Default case - an error has occured. + // Default case - an error has occurred. default: return false; } } |