Implemented VOL APIs and C constants, no tests

7 files changed, 355 insertions, 27 deletions

diff --git a/MANIFEST b/MANIFEST
index cb22f4d..6443250 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -238,6 +238,7 @@
 ./fortran/src/H5Sff.F90
 ./fortran/src/H5Tf.c
 ./fortran/src/H5Tff.F90
+./fortran/src/H5VLff.F90
 ./fortran/src/H5Zf.c
 ./fortran/src/H5Zff.F90
 ./fortran/src/H5config_f.inc.cmake
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 455c72e..d6e70b3 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -7929,7 +7929,7 @@ SUBROUTINE h5pget_virtual_filename_f(dcpl_id, index, name, hdferr, name_len)
   
   INTERFACE
      INTEGER(SIZE_T) FUNCTION h5pget_virtual_filename(dcpl_id, index, name, size) BIND(C, NAME='H5Pget_virtual_filename')
-       IMPORT :: HID_T, SIZE_T, C_PTR, C_CHAR
+       IMPORT :: HID_T, SIZE_T, C_PTR
          IMPLICIT NONE
        INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
        INTEGER(SIZE_T), INTENT(IN), VALUE :: index
@@ -7997,7 +7997,7 @@ SUBROUTINE h5pget_virtual_dsetname_f(dcpl_id, index, name, hdferr, name_len)
   
   INTERFACE
      INTEGER(SIZE_T) FUNCTION h5pget_virtual_dsetname(dcpl_id, index, name, size) BIND(C, NAME='H5Pget_virtual_dsetname')
-       IMPORT :: HID_T, SIZE_T, C_PTR, C_CHAR
+       IMPORT :: HID_T, SIZE_T, C_PTR
          IMPLICIT NONE
        INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
        INTEGER(SIZE_T), INTENT(IN), VALUE :: index
@@ -8018,7 +8018,6 @@ SUBROUTINE h5pget_virtual_dsetname_f(dcpl_id, index, name, hdferr, name_len)
      ELSE
         CALL HD5c2fstring(name,c_name,LEN(name))
      ENDIF
-
   ENDIF
 
 END SUBROUTINE h5pget_virtual_dsetname_f
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 352ffab..018e121 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -335,6 +335,7 @@ h5close_types_c( hid_t_f * types, int_f *lentypes,
  *  h5s_hid_flags   - H5S interface flags of type hid_t
  *  h5s_hsize_flags - H5S interface flags of type hsize_t
  *  h5t_flags       - H5T interface flags
+ *  h5vl_flags      - H5VL interface flags
  *  h5z_flags       - H5Z interface flags
  * OUTPUTS
  *  None
@@ -366,7 +367,7 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
                 hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, 
                 int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, 
-		int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags,
+		int_f *h5t_flags, int_f *h5vl_flags, int_f *h5z_flags, int_f *h5_generic_flags,
                 haddr_t_f *h5_haddr_generic_flags)
 /******/
 {
@@ -498,6 +499,16 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
     h5i_flags[4] = (int_f)H5I_DATASET;
     h5i_flags[5] = (int_f)H5I_ATTR;
     h5i_flags[6] = (int_f)H5I_BADID;
+    h5i_flags[7] = (int_f)H5I_UNINIT;
+    h5i_flags[8] = (int_f)H5I_VFL;
+    h5i_flags[9] = (int_f)H5I_VOL;
+    h5i_flags[10] = (int_f)H5I_GENPROP_CLS;
+    h5i_flags[11] = (int_f)H5I_GENPROP_LST;
+    h5i_flags[12] = (int_f)H5I_ERROR_CLASS;
+    h5i_flags[13] = (int_f)H5I_ERROR_MSG;
+    h5i_flags[14] = (int_f)H5I_ERROR_STACK;
+    h5i_flags[15] = (int_f)H5I_NTYPES;
+    h5i_flags[16] = (int_f)H5I_INVALID_HID;
 /*
  *  H5L flags
  */
@@ -660,7 +671,76 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
       h5t_flags[32] = (int_f)H5T_ARRAY;
       h5t_flags[33] = (int_f)H5T_DIR_ASCEND;
       h5t_flags[34] = (int_f)H5T_DIR_DESCEND;
-
+/*
+ *  H5VL flags
+ */
+      h5vl_flags[0] = (int_f)H5VL_ATTR_GET_ACPL;
+      h5vl_flags[1] = (int_f)H5VL_ATTR_GET_INFO;
+      h5vl_flags[2] = (int_f)H5VL_ATTR_GET_NAME;
+      h5vl_flags[3] = (int_f)H5VL_ATTR_GET_SPACE;
+      h5vl_flags[4] = (int_f)H5VL_ATTR_GET_STORAGE_SIZE;
+      h5vl_flags[5] = (int_f)H5VL_ATTR_GET_TYPE;
+      h5vl_flags[6] = (int_f)H5VL_ATTR_DELETE;
+      h5vl_flags[7] = (int_f)H5VL_ATTR_EXISTS;
+      h5vl_flags[8] = (int_f)H5VL_ATTR_ITER;
+      h5vl_flags[8] = (int_f)H5VL_ATTR_RENAME;
+      h5vl_flags[9] = (int_f)H5VL_DATASET_GET_DAPL;
+      h5vl_flags[11] = (int_f)H5VL_DATASET_GET_DCPL;
+      h5vl_flags[12] = (int_f)H5VL_DATASET_GET_OFFSET;
+      h5vl_flags[13] = (int_f)H5VL_DATASET_GET_SPACE;
+      h5vl_flags[14] = (int_f)H5VL_DATASET_GET_SPACE_STATUS;
+      h5vl_flags[15] = (int_f)H5VL_DATASET_GET_STORAGE_SIZE;
+      h5vl_flags[16] = (int_f)H5VL_DATASET_GET_TYPE;
+      h5vl_flags[17] = (int_f)H5VL_DATASET_SET_EXTENT;
+      h5vl_flags[18] = (int_f)H5VL_DATASET_FLUSH;
+      h5vl_flags[19] = (int_f)H5VL_DATASET_REFRESH;
+      h5vl_flags[20] = (int_f)H5VL_DATATYPE_GET_BINARY;
+      h5vl_flags[21] = (int_f)H5VL_DATATYPE_GET_TCPL;
+      h5vl_flags[22] = (int_f)H5VL_DATATYPE_FLUSH;
+      h5vl_flags[23] = (int_f)H5VL_DATATYPE_REFRESH;
+      h5vl_flags[24] = (int_f)H5VL_FILE_GET_FAPL;
+      h5vl_flags[25] = (int_f)H5VL_FILE_GET_FCPL;
+      h5vl_flags[26] = (int_f)H5VL_FILE_GET_INTENT;
+      h5vl_flags[27] = (int_f)H5VL_FILE_GET_NAME;
+      h5vl_flags[28] = (int_f)H5VL_FILE_GET_OBJ_COUNT;
+      h5vl_flags[29] = (int_f)H5VL_FILE_GET_OBJ_IDS;
+      h5vl_flags[30] = (int_f)H5VL_FILE_FLUSH;
+      h5vl_flags[31] = (int_f)H5VL_FILE_REOPEN;
+      h5vl_flags[32] = (int_f)H5VL_FILE_MOUNT;
+      h5vl_flags[33] = (int_f)H5VL_FILE_UNMOUNT;
+      h5vl_flags[34] = (int_f)H5VL_FILE_IS_ACCESSIBLE;
+      h5vl_flags[35] = (int_f)H5VL_FILE_CACHE_VOL_CONN;
+      h5vl_flags[36] = (int_f)H5VL_GROUP_GET_GCPL;
+      h5vl_flags[37] = (int_f)H5VL_GROUP_GET_INFO;
+      h5vl_flags[38] = (int_f)H5VL_GROUP_FLUSH;
+      h5vl_flags[39] = (int_f)H5VL_GROUP_REFRESH;
+      h5vl_flags[40] = (int_f)H5VL_LINK_CREATE_HARD;
+      h5vl_flags[41] = (int_f)H5VL_LINK_CREATE_SOFT;
+      h5vl_flags[42] = (int_f)H5VL_LINK_CREATE_UD;
+      h5vl_flags[43] = (int_f)H5VL_LINK_GET_INFO;
+      h5vl_flags[44] = (int_f)H5VL_LINK_GET_NAME;
+      h5vl_flags[45] = (int_f)H5VL_LINK_GET_VAL;
+      h5vl_flags[46] = (int_f)H5VL_LINK_DELETE;
+      h5vl_flags[47] = (int_f)H5VL_LINK_EXISTS;
+      h5vl_flags[48] = (int_f)H5VL_LINK_ITER;
+      h5vl_flags[49] = (int_f)H5VL_REF_GET_NAME;
+      h5vl_flags[50] = (int_f)H5VL_REF_GET_REGION;
+      h5vl_flags[51] = (int_f)H5VL_REF_GET_TYPE;
+      h5vl_flags[52] = (int_f)H5VL_ID_GET_NAME;
+      h5vl_flags[53] = (int_f)H5VL_OBJECT_CHANGE_REF_COUNT;
+      h5vl_flags[54] = (int_f)H5VL_OBJECT_EXISTS;
+      h5vl_flags[55] = (int_f)H5VL_OBJECT_VISIT;
+      h5vl_flags[56] = (int_f)H5VL_REF_CREATE;
+      h5vl_flags[57] = (int_f)H5VL_OBJECT_FLUSH;
+      h5vl_flags[58] = (int_f)H5VL_OBJECT_REFRESH;
+      h5vl_flags[59] = (int_f)H5VL_REQUEST_WAITANY;
+      h5vl_flags[60] = (int_f)H5VL_REQUEST_WAITSOME;
+      h5vl_flags[61] = (int_f)H5VL_REQUEST_WAITALL;
+      h5vl_flags[62] = (int_f)H5VL_OBJECT_BY_SELF;
+      h5vl_flags[63] = (int_f)H5VL_OBJECT_BY_NAME;
+      h5vl_flags[64] = (int_f)H5VL_OBJECT_BY_IDX;
+      h5vl_flags[65] = (int_f)H5VL_OBJECT_BY_ADDR;
+      h5vl_flags[66] = (int_f)H5VL_OBJECT_BY_REF;
 /*
  *  H5Z flags
  */
@@ -684,10 +764,6 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
       h5z_flags[17] = (int_f)H5Z_SO_FLOAT_ESCALE;
       h5z_flags[18] = (int_f)H5Z_SO_INT;
       h5z_flags[19] = (int_f)H5Z_SO_INT_MINBITS_DEFAULT;
-/*
- *  H5A flags
- */
-
 
 /*
  *  H5 Generic flags introduced in version 1.8
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index f63e734..fd5d437 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -88,7 +88,7 @@ MODULE H5LIB
   !
   ! H5I flags declaration
   !
-  INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7
+  INTEGER, PARAMETER :: H5I_FLAGS_LEN = 17
   INTEGER, DIMENSION(1:H5I_FLAGS_LEN) :: H5I_flags
   !
   ! H5L flags declaration
@@ -130,6 +130,13 @@ MODULE H5LIB
   INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35
   INTEGER, DIMENSION(1:H5T_FLAGS_LEN) :: H5T_flags
   !
+  ! H5VL flags declaration
+  !
+  
+  INTEGER, PARAMETER :: H5VL_FLAGS_LEN = 67
+  INTEGER, DIMENSION(1:H5VL_FLAGS_LEN) :: H5VL_flags
+
+  !
   ! H5Z flags declaration
   !
   INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 20
@@ -204,6 +211,7 @@ CONTAINS
             i_H5S_hid_flags, &
             i_H5S_hsize_flags, &
             i_H5T_flags, &
+            i_H5VL_flags, &
             i_H5Z_flags, &
             i_H5generic_flags, &
             i_H5generic_haddr_flags) &
@@ -215,7 +223,7 @@ CONTAINS
               H5FD_HID_FLAGS_LEN, H5I_FLAGS_LEN, H5L_FLAGS_LEN, &
               H5O_FLAGS_LEN, H5P_FLAGS_LEN, H5P_FLAGS_INT_LEN, &
               H5R_FLAGS_LEN, H5S_FLAGS_LEN, H5S_HID_FLAGS_LEN, H5S_HSIZE_FLAGS_LEN, &
-              H5T_FLAGS_LEN, H5Z_FLAGS_LEN, H5generic_FLAGS_LEN, H5generic_haddr_FLAGS_LEN
+              H5T_FLAGS_LEN, H5VL_FLAGS_LEN, H5Z_FLAGS_LEN, H5generic_FLAGS_LEN, H5generic_haddr_FLAGS_LEN
          IMPLICIT NONE
          INTEGER         , DIMENSION(1:H5D_FLAGS_LEN)             :: i_H5D_flags
          INTEGER(SIZE_T) , DIMENSION(1:H5D_SIZE_FLAGS_LEN)        :: i_H5D_size_flags
@@ -235,6 +243,7 @@ CONTAINS
          INTEGER(HID_T)  , DIMENSION(1:H5S_HID_FLAGS_LEN)         :: i_H5S_hid_flags
          INTEGER(HSIZE_T), DIMENSION(1:H5S_HSIZE_FLAGS_LEN)       :: i_H5S_hsize_flags
          INTEGER         , DIMENSION(1:H5T_FLAGS_LEN)             :: i_H5T_flags
+         INTEGER         , DIMENSION(1:H5VL_FLAGS_LEN)            :: i_H5VL_flags
          INTEGER         , DIMENSION(1:H5Z_FLAGS_LEN)             :: i_H5Z_flags
          INTEGER         , DIMENSION(1:H5generic_FLAGS_LEN)       :: i_H5generic_flags
          INTEGER(HADDR_T), DIMENSION(1:H5generic_haddr_FLAGS_LEN) :: i_H5generic_haddr_flags
@@ -318,6 +327,7 @@ CONTAINS
          H5S_hid_flags, &
          H5S_hsize_flags, &
          H5T_flags, &
+         H5VL_flags, &
          H5Z_flags, &
          H5generic_flags,&
          H5generic_haddr_flags)
@@ -443,13 +453,23 @@ CONTAINS
     !
     ! H5I flags declaration
     !
-    H5I_FILE_F      = H5I_flags(1)
-    H5I_GROUP_F     = H5I_flags(2)
-    H5I_DATATYPE_F  = H5I_flags(3)
-    H5I_DATASPACE_F = H5I_flags(4)
-    H5I_DATASET_F   = H5I_flags(5)
-    H5I_ATTR_F      = H5I_flags(6)
-    H5I_BADID_F     = H5I_flags(7)
+    H5I_FILE_F        = H5I_flags(1)
+    H5I_GROUP_F       = H5I_flags(2)
+    H5I_DATATYPE_F    = H5I_flags(3)
+    H5I_DATASPACE_F   = H5I_flags(4)
+    H5I_DATASET_F     = H5I_flags(5)
+    H5I_ATTR_F        = H5I_flags(6)
+    H5I_BADID_F       = H5I_flags(7)
+    H5I_UNINIT_F      = H5I_flags(8)
+    H5I_VFL_F         = H5I_flags(9)
+    H5I_VOL_F         = H5I_flags(10)
+    H5I_GENPROP_CLS_F = H5I_flags(11)
+    H5I_GENPROP_LST_F = H5I_flags(12)
+    H5I_ERROR_CLASS_F = H5I_flags(13)
+    H5I_ERROR_MSG_F   = H5I_flags(14)
+    H5I_ERROR_STACK_F = H5I_flags(15)
+    H5I_NTYPES_F      = H5I_flags(16)
+    H5I_INVALID_HID_F = H5I_flags(17)
     !
     ! H5L flags
     !    
@@ -584,6 +604,76 @@ CONTAINS
     H5T_DIR_ASCEND_F     = H5T_flags(34)
     H5T_DIR_DESCEND_F    = H5T_flags(35)
     !
+    ! H5VL flags declaration
+    !
+    H5VL_ATTR_GET_ACPL_F            = H5VL_flags(1)
+    H5VL_ATTR_GET_INFO_F            = H5VL_flags(2)
+    H5VL_ATTR_GET_NAME_F            = H5VL_flags(3)
+    H5VL_ATTR_GET_SPACE_F           = H5VL_flags(4)
+    H5VL_ATTR_GET_STORAGE_SIZE_F    = H5VL_flags(5)
+    H5VL_ATTR_GET_TYPE_F            = H5VL_flags(6)
+    H5VL_ATTR_DELETE_F              = H5VL_flags(7)
+    H5VL_ATTR_EXISTS_F              = H5VL_flags(8)
+    H5VL_ATTR_ITER_F                = H5VL_flags(9)
+    H5VL_ATTR_RENAME_F              = H5VL_flags(10)
+    H5VL_DATASET_GET_DAPL_F         = H5VL_flags(11)
+    H5VL_DATASET_GET_DCPL_F         = H5VL_flags(12)
+    H5VL_DATASET_GET_OFFSET_F       = H5VL_flags(13)
+    H5VL_DATASET_GET_SPACE_F        = H5VL_flags(14)
+    H5VL_DATASET_GET_SPACE_STATUS_F = H5VL_flags(15)
+    H5VL_DATASET_GET_STORAGE_SIZE_F = H5VL_flags(16)
+    H5VL_DATASET_GET_TYPE_F         = H5VL_flags(17)
+    H5VL_DATASET_SET_EXTENT_F       = H5VL_flags(18)
+    H5VL_DATASET_FLUSH_F            = H5VL_flags(19)
+    H5VL_DATASET_REFRESH_F          = H5VL_flags(20)
+    H5VL_DATATYPE_GET_BINARY_F      = H5VL_flags(21)
+    H5VL_DATATYPE_GET_TCPL_F        = H5VL_flags(22)
+    H5VL_DATATYPE_FLUSH_F           = H5VL_flags(23)
+    H5VL_DATATYPE_REFRESH_F         = H5VL_flags(24)
+    H5VL_FILE_GET_FAPL_F            = H5VL_flags(25)
+    H5VL_FILE_GET_FCPL_F            = H5VL_flags(26)
+    H5VL_FILE_GET_INTENT_F          = H5VL_flags(27)
+    H5VL_FILE_GET_NAME_F            = H5VL_flags(28)
+    H5VL_FILE_GET_OBJ_COUNT_F       = H5VL_flags(29)
+    H5VL_FILE_GET_OBJ_IDS_F         = H5VL_flags(30)
+    H5VL_FILE_FLUSH_F               = H5VL_flags(31)
+    H5VL_FILE_REOPEN_F              = H5VL_flags(32)
+    H5VL_FILE_MOUNT_F               = H5VL_flags(33)
+    H5VL_FILE_UNMOUNT_F             = H5VL_flags(34)
+    H5VL_FILE_IS_ACCESSIBLE_F       = H5VL_flags(35)
+    H5VL_FILE_CACHE_VOL_CONN_F      = H5VL_flags(36)
+    H5VL_GROUP_GET_GCPL_F           = H5VL_flags(37)
+    H5VL_GROUP_GET_INFO_F           = H5VL_flags(38)
+    H5VL_GROUP_FLUSH_F              = H5VL_flags(39)
+    H5VL_GROUP_REFRESH_F            = H5VL_flags(40)
+    H5VL_LINK_CREATE_HARD_F         = H5VL_flags(41)
+    H5VL_LINK_CREATE_SOFT_F         = H5VL_flags(42)
+    H5VL_LINK_CREATE_UD_F           = H5VL_flags(43)
+    H5VL_LINK_GET_INFO_F            = H5VL_flags(44)
+    H5VL_LINK_GET_NAME_F            = H5VL_flags(45)
+    H5VL_LINK_GET_VAL_F             = H5VL_flags(46)
+    H5VL_LINK_DELETE_F              = H5VL_flags(47)
+    H5VL_LINK_EXISTS_F              = H5VL_flags(48)
+    H5VL_LINK_ITER_F                = H5VL_flags(49)
+    H5VL_REF_GET_NAME_F             = H5VL_flags(50)
+    H5VL_REF_GET_REGION_F           = H5VL_flags(51)
+    H5VL_REF_GET_TYPE_F             = H5VL_flags(52)
+    H5VL_ID_GET_NAME_F              = H5VL_flags(53)
+    H5VL_OBJECT_CHANGE_REF_COUNT_F  = H5VL_flags(54)
+    H5VL_OBJECT_EXISTS_F            = H5VL_flags(55)
+    H5VL_OBJECT_VISIT_F             = H5VL_flags(56)
+    H5VL_REF_CREATE_F               = H5VL_flags(57)
+    H5VL_OBJECT_FLUSH_F             = H5VL_flags(58)
+    H5VL_OBJECT_REFRESH_F           = H5VL_flags(59)
+    H5VL_REQUEST_WAITANY_F          = H5VL_flags(60)
+    H5VL_REQUEST_WAITSOME_F         = H5VL_flags(61)
+    H5VL_REQUEST_WAITALL_F          = H5VL_flags(62)
+    H5VL_OBJECT_BY_SELF_F           = H5VL_flags(63)
+    H5VL_OBJECT_BY_NAME_F           = H5VL_flags(64)
+    H5VL_OBJECT_BY_IDX_F            = H5VL_flags(65)
+    H5VL_OBJECT_BY_ADDR_F           = H5VL_flags(66)
+    H5VL_OBJECT_BY_REF_F            = H5VL_flags(67)
+    !
     ! H5Z flags
     !
     H5Z_FILTER_ERROR_F           = H5Z_flags(1)
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 078778a..685026c 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -435,15 +435,36 @@ MODULE H5GLOBAL
   !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATASET_F
   !DEC$ATTRIBUTES DLLEXPORT :: H5I_ATTR_F
   !DEC$ATTRIBUTES DLLEXPORT :: H5I_BADID_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_UNINIT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_VFL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_VOL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_GENPROP_CLS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_GENPROP_LST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ERROR_CLASS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ERROR_MSG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ERROR_STACK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_NTYPES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_INVALID_HID_F
   !DEC$endif
 
-  INTEGER ::  H5I_FILE_F
-  INTEGER ::  H5I_GROUP_F
-  INTEGER ::  H5I_DATATYPE_F
-  INTEGER ::  H5I_DATASPACE_F
-  INTEGER ::  H5I_DATASET_F
-  INTEGER ::  H5I_ATTR_F
-  INTEGER ::  H5I_BADID_F
+  INTEGER :: H5I_FILE_F
+  INTEGER :: H5I_GROUP_F
+  INTEGER :: H5I_DATATYPE_F
+  INTEGER :: H5I_DATASPACE_F
+  INTEGER :: H5I_DATASET_F
+  INTEGER :: H5I_ATTR_F
+  INTEGER :: H5I_BADID_F
+  INTEGER :: H5I_UNINIT_F
+  INTEGER :: H5I_VFL_F
+  INTEGER :: H5I_VOL_F
+  INTEGER :: H5I_GENPROP_CLS_F
+  INTEGER :: H5I_GENPROP_LST_F
+  INTEGER :: H5I_ERROR_CLASS_F
+  INTEGER :: H5I_ERROR_MSG_F
+  INTEGER :: H5I_ERROR_STACK_F
+  INTEGER :: H5I_NTYPES_F
+  INTEGER :: H5I_INVALID_HID_F
+
   !
   ! H5L flags declaration
   !
@@ -706,6 +727,147 @@ MODULE H5GLOBAL
   INTEGER :: H5T_DIR_ASCEND_F
   INTEGER :: H5T_DIR_DESCEND_F
   !
+  ! H5VL flags declaration
+  !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_GET_ACPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_GET_INFO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_GET_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_GET_SPACE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_GET_STORAGE_SIZE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_GET_TYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_DELETE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_EXISTS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_ITER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ATTR_RENAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_DAPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_DCPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_OFFSET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_SPACE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_SPACE_STATUS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_STORAGE_SIZE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_GET_TYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_SET_EXTENT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_FLUSH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATASET_REFRESH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATATYPE_GET_BINARY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATATYPE_GET_TCPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATATYPE_FLUSH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_DATATYPE_REFRESH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_GET_FAPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_GET_FCPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_GET_INTENT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_GET_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_GET_OBJ_COUNT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_GET_OBJ_IDS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_FLUSH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_REOPEN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_MOUNT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_UNMOUNT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_IS_ACCESSIBLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_FILE_CACHE_VOL_CONN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_GROUP_GET_GCPL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_GROUP_GET_INFO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_GROUP_FLUSH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_GROUP_REFRESH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_CREATE_HARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_CREATE_SOFT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_CREATE_UD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_GET_INFO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_GET_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_GET_VAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_DELETE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_EXISTS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_LINK_ITER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REF_GET_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REF_GET_REGION_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REF_GET_TYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_ID_GET_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_CHANGE_REF_COUNT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_EXISTS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_VISIT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REF_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_FLUSH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_REFRESH_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REQUEST_WAITANY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REQUEST_WAITSOME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_REQUEST_WAITALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_BY_SELF_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_BY_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_BY_IDX_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_BY_ADDR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5VL_OBJECT_BY_REF_F
+  !DEC$endif
+
+  INTEGER :: H5VL_ATTR_GET_ACPL_F
+  INTEGER :: H5VL_ATTR_GET_INFO_F
+  INTEGER :: H5VL_ATTR_GET_NAME_F
+  INTEGER :: H5VL_ATTR_GET_SPACE_F
+  INTEGER :: H5VL_ATTR_GET_STORAGE_SIZE_F
+  INTEGER :: H5VL_ATTR_GET_TYPE_F
+  INTEGER :: H5VL_ATTR_DELETE_F
+  INTEGER :: H5VL_ATTR_EXISTS_F
+  INTEGER :: H5VL_ATTR_ITER_F
+  INTEGER :: H5VL_ATTR_RENAME_F
+  INTEGER :: H5VL_DATASET_GET_DAPL_F
+  INTEGER :: H5VL_DATASET_GET_DCPL_F
+  INTEGER :: H5VL_DATASET_GET_OFFSET_F
+  INTEGER :: H5VL_DATASET_GET_SPACE_F
+  INTEGER :: H5VL_DATASET_GET_SPACE_STATUS_F
+  INTEGER :: H5VL_DATASET_GET_STORAGE_SIZE_F
+  INTEGER :: H5VL_DATASET_GET_TYPE_F
+  INTEGER :: H5VL_DATASET_SET_EXTENT_F
+  INTEGER :: H5VL_DATASET_FLUSH_F
+  INTEGER :: H5VL_DATASET_REFRESH_F
+  INTEGER :: H5VL_DATATYPE_GET_BINARY_F
+  INTEGER :: H5VL_DATATYPE_GET_TCPL_F
+  INTEGER :: H5VL_DATATYPE_FLUSH_F
+  INTEGER :: H5VL_DATATYPE_REFRESH_F
+  INTEGER :: H5VL_FILE_GET_FAPL_F
+  INTEGER :: H5VL_FILE_GET_FCPL_F
+  INTEGER :: H5VL_FILE_GET_INTENT_F
+  INTEGER :: H5VL_FILE_GET_NAME_F
+  INTEGER :: H5VL_FILE_GET_OBJ_COUNT_F
+  INTEGER :: H5VL_FILE_GET_OBJ_IDS_F
+  INTEGER :: H5VL_FILE_FLUSH_F
+  INTEGER :: H5VL_FILE_REOPEN_F
+  INTEGER :: H5VL_FILE_MOUNT_F
+  INTEGER :: H5VL_FILE_UNMOUNT_F
+  INTEGER :: H5VL_FILE_IS_ACCESSIBLE_F
+  INTEGER :: H5VL_FILE_CACHE_VOL_CONN_F
+  INTEGER :: H5VL_GROUP_GET_GCPL_F
+  INTEGER :: H5VL_GROUP_GET_INFO_F
+  INTEGER :: H5VL_GROUP_FLUSH_F
+  INTEGER :: H5VL_GROUP_REFRESH_F
+  INTEGER :: H5VL_LINK_CREATE_HARD_F
+  INTEGER :: H5VL_LINK_CREATE_SOFT_F
+  INTEGER :: H5VL_LINK_CREATE_UD_F
+  INTEGER :: H5VL_LINK_GET_INFO_F
+  INTEGER :: H5VL_LINK_GET_NAME_F
+  INTEGER :: H5VL_LINK_GET_VAL_F
+  INTEGER :: H5VL_LINK_DELETE_F
+  INTEGER :: H5VL_LINK_EXISTS_F
+  INTEGER :: H5VL_LINK_ITER_F
+  INTEGER :: H5VL_REF_GET_NAME_F
+  INTEGER :: H5VL_REF_GET_REGION_F
+  INTEGER :: H5VL_REF_GET_TYPE_F
+  INTEGER :: H5VL_ID_GET_NAME_F
+  INTEGER :: H5VL_OBJECT_CHANGE_REF_COUNT_F
+  INTEGER :: H5VL_OBJECT_EXISTS_F
+  INTEGER :: H5VL_OBJECT_VISIT_F
+  INTEGER :: H5VL_REF_CREATE_F
+  INTEGER :: H5VL_OBJECT_FLUSH_F
+  INTEGER :: H5VL_OBJECT_REFRESH_F
+  INTEGER :: H5VL_REQUEST_WAITANY_F
+  INTEGER :: H5VL_REQUEST_WAITSOME_F
+  INTEGER :: H5VL_REQUEST_WAITALL_F
+  INTEGER :: H5VL_OBJECT_BY_SELF_F
+  INTEGER :: H5VL_OBJECT_BY_NAME_F
+  INTEGER :: H5VL_OBJECT_BY_IDX_F
+  INTEGER :: H5VL_OBJECT_BY_ADDR_F
+  INTEGER :: H5VL_OBJECT_BY_REF_F
+
+  !
   ! H5Z flags declaration
   !
   !DEC$if defined(BUILD_HDF5_DLL)
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 0884eb6..49ffca3 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -528,7 +528,7 @@ H5_FCDLL int_f h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
                 hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, 
                 int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, 
-		int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags,
+		int_f *h5t_flags, int_f *h5vl_flags, int_f *h5z_flags, int_f *h5_generic_flags,
                 haddr_t_f *h5_haddr_generic_flags);
 H5_FCDLL int_f h5init1_flags_c(int_f *h5lib_flags);
 H5_FCDLL int_f h5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum);
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index b276128..2b055e7 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -360,7 +360,7 @@ typedef int H5VL_class_value_t;
 
 /* VOL connector identifier values */
 #define H5_VOL_INVALID  (-1)    /* Invalid ID for VOL connector iD */
-#define H5_VOL_NATIVE   0       /* Native HDF5 file formnat VOL connector */
+#define H5_VOL_NATIVE   0       /* Native HDF5 file format VOL connector */
 #define H5_VOL_RESERVED 256     /* VOL connector IDs below this value are reserved for library use */
 #define H5_VOL_MAX	65535	/* Maximum VOL connector ID */