Mercurial > hg > icedtea7-forest > jdk
changeset 9148:40e025740ded
8150490: Update OS detection code to recognize Windows Server 2016
Reviewed-by: mgronlun, alanb, dholmes
author | msolovie |
---|---|
date | Thu, 20 Apr 2017 06:34:16 +0100 |
parents | d10eca2409d4 |
children | 6074514aeaab |
files | src/windows/native/java/lang/java_props_md.c |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/java/lang/java_props_md.c Thu Apr 20 06:33:08 2017 +0100 +++ b/src/windows/native/java/lang/java_props_md.c Thu Apr 20 06:34:16 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -437,7 +437,9 @@ * Windows Server 2008 R2 6 1 (!VER_NT_WORKSTATION) * Windows 8 6 2 (VER_NT_WORKSTATION) * Windows Server 2012 6 2 (!VER_NT_WORKSTATION) + * Windows Server 2012 R2 6 3 (!VER_NT_WORKSTATION) * Windows 10 10 0 (VER_NT_WORKSTATION) + * Windows Server 2016 10 0 (!VER_NT_WORKSTATION) * * This mapping will presumably be augmented as new Windows * versions are released. @@ -511,6 +513,7 @@ } } else { switch (minorVersion) { + case 0: sprops.os_name = "Windows Server 2016"; break; default: sprops.os_name = "Windows NT (unknown)"; } }