hotspot/src/share/vm/prims/jvm.h

*** 1182,1195 ****
   *    SDK:  JDK_GetVersionInfo0
   *
   * ==========================================================================
   */
  typedef struct {
!     /* VM version string: follows the JDK release version naming convention    */
!     unsigned int jvm_version;
!     unsigned int update_version : 8;
!     unsigned int special_update_version : 8;
      unsigned int reserved1 : 16;
      unsigned int reserved2;
  
      /* The following bits represents JVM supports that JDK has dependency on.
       * JDK can use these bits to determine which JVM version
--- 1182,1194 ----
   *    SDK:  JDK_GetVersionInfo0
   *
   * ==========================================================================
   */
  typedef struct {
!     unsigned int jvm_version; /* Encoded $VNUM as defined by JEP-223 */
!     unsigned int patch_version : 8; /* JEP-223 patch version */
!     unsigned int reserved3 : 8;
      unsigned int reserved1 : 16;
      unsigned int reserved2;
  
      /* The following bits represents JVM supports that JDK has dependency on.
       * JDK can use these bits to determine which JVM version
*** 1211,1225 ****
  
  JNIEXPORT void JNICALL
  JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size);
  
  typedef struct {
!     // Naming convention of RE build version string: n.n.n[_uu[c]][-<identifier>]-bxx
!     unsigned int jdk_version;   /* Consists of major, minor, security (n.n.n) */
!                                 /* and build number (xx) */
!     unsigned int update_version : 8;         /* Update release version (uu) */
!     unsigned int special_update_version : 8; /* Special update release version (c)*/
      unsigned int reserved1 : 16;
      unsigned int reserved2;
  
      /* The following bits represents new JDK supports that VM has dependency on.
       * VM implementation can use these bits to determine which JDK version
--- 1210,1222 ----
  
  JNIEXPORT void JNICALL
  JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size);
  
  typedef struct {
!     unsigned int jdk_version; /* Encoded $VNUM as defined by JEP-223 */
!     unsigned int patch_version : 8; /* JEP-223 patch version */
!     unsigned int reserved3 : 8;
      unsigned int reserved1 : 16;
      unsigned int reserved2;
  
      /* The following bits represents new JDK supports that VM has dependency on.
       * VM implementation can use these bits to determine which JDK version
*** 1237,1250 ****
  } jdk_version_info;
  
  #define JDK_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24)
  #define JDK_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16)
  #define JDK_VERSION_SECURITY(version) ((version & 0x0000FF00) >> 8)
- 
- /* Build number is available only for RE build.
-  * It will be zero for internal builds.
-  */
  #define JDK_VERSION_BUILD(version) ((version & 0x000000FF))
  
  /*
   * This is the function JDK_GetVersionInfo0 defined in libjava.so
   * that is dynamically looked up by JVM.
--- 1234,1243 ----