提交 594fe762 编写于 作者: K khazra

7173645: (props) System.getProperty("os.name") should return "Windows Server...

7173645: (props) System.getProperty("os.name") should return "Windows Server 2012" for Windows Server 2012
Summary: Enable Windows Server 2012 to be recognized as "os.name"
Reviewed-by: alanb, dholmes, chegar
上级 2144e7e0
...@@ -404,6 +404,7 @@ GetJavaProperties(JNIEnv* env) ...@@ -404,6 +404,7 @@ GetJavaProperties(JNIEnv* env)
* Windows 7 6 1 (VER_NT_WORKSTATION) * Windows 7 6 1 (VER_NT_WORKSTATION)
* Windows Server 2008 R2 6 1 (!VER_NT_WORKSTATION) * Windows Server 2008 R2 6 1 (!VER_NT_WORKSTATION)
* Windows 8 6 2 (VER_NT_WORKSTATION) * Windows 8 6 2 (VER_NT_WORKSTATION)
* Windows Server 2012 6 2 (!VER_NT_WORKSTATION)
* *
* This mapping will presumably be augmented as new Windows * This mapping will presumably be augmented as new Windows
* versions are released. * versions are released.
...@@ -467,6 +468,7 @@ GetJavaProperties(JNIEnv* env) ...@@ -467,6 +468,7 @@ GetJavaProperties(JNIEnv* env)
switch (ver.dwMinorVersion) { switch (ver.dwMinorVersion) {
case 0: sprops.os_name = "Windows Server 2008"; break; case 0: sprops.os_name = "Windows Server 2008"; break;
case 1: sprops.os_name = "Windows Server 2008 R2"; break; case 1: sprops.os_name = "Windows Server 2008 R2"; break;
case 2: sprops.os_name = "Windows Server 2012"; break;
default: sprops.os_name = "Windows NT (unknown)"; default: sprops.os_name = "Windows NT (unknown)";
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册