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

*** 1183,1193 ****
   *
   * ==========================================================================
   */
  typedef struct {
      /* VM version string: follows the JDK release version naming convention    */
!     unsigned int jvm_version; /* <major_ver>.<minor_ver>.<micro_ver>[-<identifier>][-<debug_target>][-b<nn>]  */
      unsigned int update_version : 8;
      unsigned int special_update_version : 8;
      unsigned int reserved1 : 16;
      unsigned int reserved2;
  
--- 1183,1193 ----
   *
   * ==========================================================================
   */
  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;
  
*** 1204,1222 ****
      unsigned int : 32;
  } 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_BUILD(version) ((version & 0x000000FF))
  
  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, micro (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;
--- 1204,1222 ----
      unsigned int : 32;
  } jvm_version_info;
  
  #define JVM_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24)
  #define JVM_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16)
! #define JVM_VERSION_SECURITY(version) ((version & 0x0000FF00) >> 8)
  #define JVM_VERSION_BUILD(version) ((version & 0x000000FF))
  
  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;
*** 1236,1248 ****
      unsigned int : 32;
  } jdk_version_info;
  
  #define JDK_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24)
  #define JDK_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16)
! #define JDK_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8)
  
! /* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER is set to bNN)
   * It will be zero for internal builds.
   */
  #define JDK_VERSION_BUILD(version) ((version & 0x000000FF))
  
  /*
--- 1236,1248 ----
      unsigned int : 32;
  } 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))
  
  /*