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

[cmake-commits at cmake.org]

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

Modified Files:
	SystemInformation.cxx 
Log Message:
ENH: fixes for borland


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SystemInformation.cxx	31 Jan 2008 20:34:09 -0000	1.10
+++ SystemInformation.cxx	31 Jan 2008 21:37:52 -0000	1.11
@@ -2581,7 +2581,7 @@
 
       // Calculate the appropriate  shifts and mask based on the 
       // number of logical processors.
-      unsigned char i = 1;
+      unsigned int i = 1;
       unsigned char PHY_ID_MASK  = 0xFF;
       unsigned char PHY_ID_SHIFT = 0;
 
@@ -2614,12 +2614,11 @@
           if (SetProcessAffinityMask(hCurrentProcessHandle,
                                      dwAffinityMask))
             {
-            unsigned char APIC_ID, LOG_ID, PHY_ID;
+            unsigned char APIC_ID, LOG_ID;
             Sleep(0); // Give OS time to switch CPU
 
             APIC_ID = GetAPICId();
             LOG_ID  = APIC_ID & ~PHY_ID_MASK;
-            PHY_ID  = APIC_ID >> PHY_ID_SHIFT;
  
             if (LOG_ID != 0) 
               {
@@ -2791,7 +2790,7 @@
       } break;
     }
   kwsysProcess_Delete(gp);
-
+  (void)result;
   return buffer;
 }
   
@@ -2954,6 +2953,8 @@
         {
         if (osvi.wProductType == VER_NT_WORKSTATION) 
           {
+// VER_SUITE_PERSONAL may not be defined
+#ifdef VER_SUITE_PERSONAL
           if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
             {
             this->OSRelease += " Personal";
@@ -2962,6 +2963,7 @@
             {
             this->OSRelease += " Professional";
             }
+#endif
           } 
         else if (osvi.wProductType == VER_NT_SERVER)
           {