Mercurial > hg > openjdk > hsx16

changeset 980:c44e78b9aa0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Wed, 25 Nov 2009 17:01:17 -0800
parents 5f14026df877 (diff) 43e3f86b638d (current diff)
children b6e6e189e1db
files
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot_version	Wed Nov 25 12:09:02 2009 -0800
+++ b/make/hotspot_version	Wed Nov 25 17:01:17 2009 -0800
@@ -38,7 +38,7 @@
 HS_BUILD_NUMBER=12
 
 JDK_MAJOR_VER=1
-JDK_MINOR_VER=7
+JDK_MINOR_VER=6
 JDK_MICRO_VER=0
 
 # Previous (bootdir) JDK version
--- a/src/os/windows/vm/os_windows.cpp	Wed Nov 25 12:09:02 2009 -0800
+++ b/src/os/windows/vm/os_windows.cpp	Wed Nov 25 17:01:17 2009 -0800
@@ -1526,7 +1526,8 @@
     case 5000: st->print(" Windows 2000"); break;
     case 5001: st->print(" Windows XP"); break;
     case 5002:
-    case 6000: {
+    case 6000:
+    case 6001: {
       // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
       // find out whether we are running on 64 bit processor or not.
       SYSTEM_INFO si;
@@ -1549,13 +1550,21 @@
           st->print(" Windows XP x64 Edition");
         else
             st->print(" Windows Server 2003 family");
-      } else { // os_vers == 6000
+      } else if (os_vers == 6000) {
         if (osvi.wProductType == VER_NT_WORKSTATION)
             st->print(" Windows Vista");
         else
             st->print(" Windows Server 2008");
         if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
             st->print(" , 64 bit");
+      } else { // os_vers == 6001
+        if (osvi.wProductType == VER_NT_WORKSTATION) {
+            st->print(" Windows 7");
+        } else {
+            st->print(" Windows Server 2008 R2");
+        }
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
       }
       break;
     }