Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9980:aadfefa63ebc
8244548: JDK 8u: sun.misc.Version.jdkUpdateVersion() returns wrong result
Reviewed-by: aph, andrew
| author | sgehwolf |
|---|---|
| date | Wed, 06 May 2020 21:01:10 +0200 |
| parents | b164f5d98fa2 |
| children | 15a134ed08c4 |
| files | src/share/javavm/export/jvm.h |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/javavm/export/jvm.h Tue Jul 21 16:28:42 2020 +0100 +++ b/src/share/javavm/export/jvm.h Wed May 06 21:01:10 2020 +0200 @@ -1419,8 +1419,8 @@ } jvm_version_info; #define JVM_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24) -#define JVM_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16) -#define JVM_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8) +#define JVM_VERSION_MINOR(version) ((version & 0x00FFFF00) >> 8) +#define JVM_VERSION_MICRO(version) 0 /* Build number is available only for RE builds. * It will be zero for internal builds. @@ -1434,9 +1434,9 @@ // Naming convention of RE build version string: n.n.n[_uu[c]][-<identifier>]-bxx unsigned int jdk_version; /* Consists of major, minor, micro (n.n.n) */ /* and build number (xx) */ - unsigned int update_version : 8; /* Update release version (uu) */ + unsigned int update_version : 16; /* Update release version (uu) */ unsigned int special_update_version : 8; /* Special update release version (c)*/ - unsigned int reserved1 : 16; + unsigned int reserved1 : 8; unsigned int reserved2; /* The following bits represents new JDK supports that VM has dependency on.