[cmake-commits] hoffman committed SystemInformation.cxx 1.3 1.4 SystemInformation.hxx.in 1.2 1.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv23218

Modified Files:
	SystemInformation.cxx SystemInformation.hxx.in 
Log Message:
ENH: figure out long long value


Index: SystemInformation.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.hxx.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SystemInformation.hxx.in	8 Jan 2008 19:59:57 -0000	1.2
+++ SystemInformation.hxx.in	8 Jan 2008 22:51:05 -0000	1.3
@@ -91,6 +91,22 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
+#include <@KWSYS_NAMESPACE@/FundamentalType.h>
+
+#if @KWSYS_NAMESPACE at _USE_LONG_LONG
+  namespace @KWSYS_NAMESPACE@
+  {
+    typedef long long LongLong;
+  }
+#elif @KWSYS_NAMESPACE at _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 @@
   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();

Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SystemInformation.cxx	8 Jan 2008 22:20:04 -0000	1.3
+++ SystemInformation.cxx	8 Jan 2008 22:51:05 -0000	1.4
@@ -516,7 +516,7 @@
 {
 #ifdef WIN32
   int localCPUVendor[3];
-  int locallocalCPUSignature;
+  int localCPUSignature;
 
   // Use assembly to detect CPUID information...
   __try 
@@ -1946,7 +1946,7 @@
 }
 
 /** Get Cycle differences */
-long long SystemInformation::GetCyclesDifference (DELAY_FUNC DelayFunction,
+LongLong SystemInformation::GetCyclesDifference (DELAY_FUNC DelayFunction,
                                                   unsigned int uiParameter)
 {
 #ifdef WIN32