From 3777f4139d272ca93b890f2f61f5c7d9e8f29887 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 8 Jan 2008 17:51:05 -0500 Subject: [PATCH] ENH: figure out long long value --- Source/kwsys/SystemInformation.cxx | 4 ++-- Source/kwsys/SystemInformation.hxx.in | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 91446ad48..f0064f71f 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -516,7 +516,7 @@ bool SystemInformation::RetrieveCPUIdentity() { #ifdef WIN32 int localCPUVendor[3]; - int locallocalCPUSignature; + int localCPUSignature; // Use assembly to detect CPUID information... __try @@ -1946,7 +1946,7 @@ unsigned long SystemInformation::GetAvailablePhysicalMemory() } /** Get Cycle differences */ -long long SystemInformation::GetCyclesDifference (DELAY_FUNC DelayFunction, +LongLong SystemInformation::GetCyclesDifference (DELAY_FUNC DelayFunction, unsigned int uiParameter) { #ifdef WIN32 diff --git a/Source/kwsys/SystemInformation.hxx.in b/Source/kwsys/SystemInformation.hxx.in index 40d1ea37d..4894ccaf0 100644 --- a/Source/kwsys/SystemInformation.hxx.in +++ b/Source/kwsys/SystemInformation.hxx.in @@ -91,6 +91,22 @@ #include #include #endif +#include <@KWSYS_NAMESPACE@/FundamentalType.h> + +#if @KWSYS_NAMESPACE@_USE_LONG_LONG + namespace @KWSYS_NAMESPACE@ + { + typedef long long LongLong; + } +#elif @KWSYS_NAMESPACE@_USE_USE___INT64 + namespace @KWSYS_NAMESPACE@ + { + typedef __int64 LongLong; + } +#else +//# error "No Long long" +#endif + #include <@KWSYS_NAMESPACE@/stl/string> #include <@KWSYS_NAMESPACE@/stl/vector> @@ -238,7 +254,7 @@ protected: unsigned char LogicalCPUPerPhysicalCPU(); unsigned char GetAPICId(); unsigned int IsHyperThreadingSupported(); - long long GetCyclesDifference(DELAY_FUNC, unsigned int); + LongLong GetCyclesDifference(DELAY_FUNC, unsigned int); // For Linux int RetreiveInformationFromCpuInfoFile();