Merge

Thu, 13 Aug 2020 06:55:26 +0100

author
andrew
date
Thu, 13 Aug 2020 06:55:26 +0100
changeset 9974
b51d1dd00420
parent 9972
182c3887f2e6
parent 9973
a06d5e5fe5e0
child 9975
184f430ac1a2

Merge

     1.1 --- a/src/share/vm/runtime/java.hpp	Thu Aug 06 21:22:56 2020 +0100
     1.2 +++ b/src/share/vm/runtime/java.hpp	Thu Aug 13 06:55:26 2020 +0100
     1.3 @@ -138,7 +138,7 @@
     1.4      return JDK_Version(m);
     1.5    }
     1.6  
     1.7 -  static JDK_Version jdk_update(uint8_t major, uint8_t update_number) {
     1.8 +  static JDK_Version jdk_update(uint8_t major, uint16_t update_number) {
     1.9      return JDK_Version(major, 0, 0, update_number);
    1.10    }
    1.11  

mercurial