jdk/src/java.base/share/native/include/jvm.h

*** 47,57 ****
   * Second, this file contains the functions and constant definitions
   * needed by the byte code verifier and class file format checker.
   * These functions allow the verifier and format checker to be written
   * in a VM-independent way.
   *
!  * Third, this file contains various I/O and nerwork operations needed
   * by the standard Java I/O and network APIs.
   */
  
  /*
   * Bump the version number when either of the following happens:
--- 47,57 ----
   * Second, this file contains the functions and constant definitions
   * needed by the byte code verifier and class file format checker.
   * These functions allow the verifier and format checker to be written
   * in a VM-independent way.
   *
!  * Third, this file contains various I/O and network operations needed
   * by the standard Java I/O and network APIs.
   */
  
  /*
   * Bump the version number when either of the following happens:
*** 1125,1137 ****
   *    SDK:  JDK_GetVersionInfo0
   *
   * ==========================================================================
   */
  typedef struct {
!     /* Naming convention of RE build version string: n.n.n[_uu[c]][-<identifier>]-bxx */
!     unsigned int jvm_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;
  
--- 1125,1135 ----
   *    SDK:  JDK_GetVersionInfo0
   *
   * ==========================================================================
   */
  typedef struct {
!     unsigned int jvm_version;  /* Follows JDK version string as specified by JEP-223 */
      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;
  
*** 1148,1171 ****
      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)
  
  /* Build number is available only for RE builds.
   * It will be zero for internal builds.
   */
  #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;
  
--- 1146,1167 ----
      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)
  
  /* Build number is available only for RE builds.
   * It will be zero for internal builds.
   */
  #define JVM_VERSION_BUILD(version) ((version & 0x000000FF))
  
  JNIEXPORT void JNICALL
  JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size);
  
  typedef struct {
!     unsigned int jdk_version; /* JDK version string as specified by JEP-223 */
      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;
  
*** 1184,1196 ****
      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))
  
  /*
--- 1180,1192 ----
      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 (i.e. JDK_BUILD_NUMBER is set to NN)
   * It will be zero for internal builds.
   */
  #define JDK_VERSION_BUILD(version) ((version & 0x000000FF))
  
  /*