[cmake-commits] hoffman committed SystemInformation.cxx 1.11 1.12

[cmake-commits at cmake.org]

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

Modified Files:
	SystemInformation.cxx 
Log Message:
ENH: try to fix hp and vs 6, again...


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- SystemInformation.cxx	31 Jan 2008 21:37:52 -0000	1.11
+++ SystemInformation.cxx	1 Feb 2008 02:33:32 -0000	1.12
@@ -125,7 +125,7 @@
   void RunCPUCheck();
   void RunOSCheck();
   void RunMemoryCheck();
-private:
+public:
 #define VENDOR_STRING_LENGTH    (12 + 1)
 #define CHIPNAME_STRING_LENGTH    (48 + 1)
 #define SERIALNUMBER_STRING_LENGTH  (29 + 1)
@@ -389,15 +389,15 @@
 /** Run the different checks */
 void SystemInformation::RunCPUCheck()
 {
-  return this->Implementation->RunCPUCheck();
+  this->Implementation->RunCPUCheck();
 }
 void SystemInformation::RunOSCheck()
 {
-  return this->Implementation->RunOSCheck();
+  this->Implementation->RunOSCheck();
 }
 void SystemInformation::RunMemoryCheck()
 {
-  return this->Implementation->RunMemoryCheck();
+  this->Implementation->RunMemoryCheck();
 }
 
 
@@ -2947,7 +2947,7 @@
         {
         this->OSRelease = "XP";
         }
-
+#ifdef VER_NT_WORKSTATION
       // Test for product type.
       if (bOsVersionInfoEx) 
         {
@@ -2990,8 +2990,9 @@
 
         sprintf (operatingSystem, "%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
         this->OSVersion = operatingSystem; 
-        } 
+        }
       else 
+#endif        // VER_NT_WORKSTATION
         {
         HKEY hKey;
         char szProductType[80];