removed H5VL constants

7 files changed, 3 insertions, 552 deletions

diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index fdf4b9e..2d1c6e7 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -335,7 +335,6 @@ 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
@@ -367,7 +366,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 *h5vl_flags, int_f *h5z_flags, int_f *h5_generic_flags,
+		int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags,
                 haddr_t_f *h5_haddr_generic_flags)
 /******/
 {
@@ -643,7 +642,6 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
       h5s_flags[15] = (int_f)H5S_SEL_POINTS;
       h5s_flags[16] = (int_f)H5S_SEL_HYPERSLABS;
       h5s_flags[17] = (int_f)H5S_SEL_ALL;
-
 /*
  *  H5T flags
  */
@@ -683,75 +681,6 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
       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_GROUP_GET_GCPL;
-      h5vl_flags[36] = (int_f)H5VL_GROUP_GET_INFO;
-      h5vl_flags[37] = (int_f)H5VL_GROUP_FLUSH;
-      h5vl_flags[38] = (int_f)H5VL_GROUP_REFRESH;
-      h5vl_flags[39] = (int_f)H5VL_LINK_CREATE_HARD;
-      h5vl_flags[40] = (int_f)H5VL_LINK_CREATE_SOFT;
-      h5vl_flags[41] = (int_f)H5VL_LINK_CREATE_UD;
-      h5vl_flags[42] = (int_f)H5VL_LINK_GET_INFO;
-      h5vl_flags[43] = (int_f)H5VL_LINK_GET_NAME;
-      h5vl_flags[44] = (int_f)H5VL_LINK_GET_VAL;
-      h5vl_flags[45] = (int_f)H5VL_LINK_DELETE;
-      h5vl_flags[46] = (int_f)H5VL_LINK_EXISTS;
-      h5vl_flags[47] = (int_f)H5VL_LINK_ITER;
-      h5vl_flags[48] = (int_f)H5VL_REF_GET_NAME;
-      h5vl_flags[49] = (int_f)H5VL_REF_GET_REGION;
-      h5vl_flags[50] = (int_f)H5VL_REF_GET_TYPE;
-      h5vl_flags[51] = (int_f)H5VL_ID_GET_NAME;
-      h5vl_flags[52] = (int_f)H5VL_OBJECT_CHANGE_REF_COUNT;
-      h5vl_flags[53] = (int_f)H5VL_OBJECT_EXISTS;
-      h5vl_flags[54] = (int_f)H5VL_OBJECT_VISIT;
-      h5vl_flags[55] = (int_f)H5VL_REF_CREATE;
-      h5vl_flags[56] = (int_f)H5VL_OBJECT_FLUSH;
-      h5vl_flags[57] = (int_f)H5VL_OBJECT_REFRESH;
-      h5vl_flags[58] = (int_f)H5VL_REQUEST_WAITANY;
-      h5vl_flags[59] = (int_f)H5VL_REQUEST_WAITSOME;
-      h5vl_flags[60] = (int_f)H5VL_REQUEST_WAITALL;
-      h5vl_flags[61] = (int_f)H5VL_OBJECT_BY_SELF;
-      h5vl_flags[62] = (int_f)H5VL_OBJECT_BY_NAME;
-      h5vl_flags[63] = (int_f)H5VL_OBJECT_BY_IDX;
-      h5vl_flags[64] = (int_f)H5VL_OBJECT_BY_ADDR;
-      h5vl_flags[65] = (int_f)H5VL_OBJECT_BY_REF;
-/*
  *  H5Z flags
  */
       h5z_flags[0] = (int_f)H5Z_FILTER_ERROR;
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index 0d82f42..443be79 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -129,12 +129,6 @@ MODULE H5LIB
   !
   INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35
   INTEGER, DIMENSION(1:H5T_FLAGS_LEN) :: H5T_flags
-  !
-  ! H5VL flags declaration
-  !
-  
-  INTEGER, PARAMETER :: H5VL_FLAGS_LEN = 66
-  INTEGER, DIMENSION(1:H5VL_FLAGS_LEN) :: H5VL_flags
 
   !
   ! H5Z flags declaration
@@ -211,7 +205,6 @@ 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) &
@@ -223,7 +216,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, H5VL_FLAGS_LEN, H5Z_FLAGS_LEN, H5generic_FLAGS_LEN, H5generic_haddr_FLAGS_LEN
+              H5T_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
@@ -243,7 +236,6 @@ 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
@@ -327,7 +319,6 @@ CONTAINS
          H5S_hid_flags, &
          H5S_hsize_flags, &
          H5T_flags, &
-         H5VL_flags, &
          H5Z_flags, &
          H5generic_flags,&
          H5generic_haddr_flags)
@@ -610,75 +601,6 @@ 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_GROUP_GET_GCPL_F           = H5VL_flags(36)
-    H5VL_GROUP_GET_INFO_F           = H5VL_flags(37)
-    H5VL_GROUP_FLUSH_F              = H5VL_flags(38)
-    H5VL_GROUP_REFRESH_F            = H5VL_flags(39)
-    H5VL_LINK_CREATE_HARD_F         = H5VL_flags(40)
-    H5VL_LINK_CREATE_SOFT_F         = H5VL_flags(41)
-    H5VL_LINK_CREATE_UD_F           = H5VL_flags(42)
-    H5VL_LINK_GET_INFO_F            = H5VL_flags(43)
-    H5VL_LINK_GET_NAME_F            = H5VL_flags(44)
-    H5VL_LINK_GET_VAL_F             = H5VL_flags(45)
-    H5VL_LINK_DELETE_F              = H5VL_flags(46)
-    H5VL_LINK_EXISTS_F              = H5VL_flags(47)
-    H5VL_LINK_ITER_F                = H5VL_flags(48)
-    H5VL_REF_GET_NAME_F             = H5VL_flags(49)
-    H5VL_REF_GET_REGION_F           = H5VL_flags(50)
-    H5VL_REF_GET_TYPE_F             = H5VL_flags(51)
-    H5VL_ID_GET_NAME_F              = H5VL_flags(52)
-    H5VL_OBJECT_CHANGE_REF_COUNT_F  = H5VL_flags(53)
-    H5VL_OBJECT_EXISTS_F            = H5VL_flags(54)
-    H5VL_OBJECT_VISIT_F             = H5VL_flags(55)
-    H5VL_REF_CREATE_F               = H5VL_flags(56)
-    H5VL_OBJECT_FLUSH_F             = H5VL_flags(57)
-    H5VL_OBJECT_REFRESH_F           = H5VL_flags(58)
-    H5VL_REQUEST_WAITANY_F          = H5VL_flags(59)
-    H5VL_REQUEST_WAITSOME_F         = H5VL_flags(60)
-    H5VL_REQUEST_WAITALL_F          = H5VL_flags(61)
-    H5VL_OBJECT_BY_SELF_F           = H5VL_flags(62)
-    H5VL_OBJECT_BY_NAME_F           = H5VL_flags(63)
-    H5VL_OBJECT_BY_IDX_F            = H5VL_flags(64)
-    H5VL_OBJECT_BY_ADDR_F           = H5VL_flags(65)
-    H5VL_OBJECT_BY_REF_F            = H5VL_flags(66)
-    !
     ! H5Z flags
     !
     H5Z_FILTER_ERROR_F           = H5Z_flags(1)
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 0a8a153..02e3bc3 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -740,147 +740,6 @@ 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 7945857..b357715 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -526,7 +526,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 *h5vl_flags, int_f *h5z_flags, int_f *h5_generic_flags,
+		int_f *h5t_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/fortran/test/null_vol_connector.c b/fortran/test/null_vol_connector.c
deleted file mode 100644
index e30a659..0000000
--- a/fortran/test/null_vol_connector.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* Purpose:     A simple virtual object layer (VOL) connector with almost no
- *              functionality that is used for testing basic plugin handling
- *              (registration, etc.).
- */
-
-#include <stdlib.h>
-#include "H5PLextern.h"
-
-#include "null_vol_connector.h"
-
-static void *H5VL_file_create(const char *name);
-static herr_t H5VL_file_close(void *file);
-
-/* The VOL class struct */
-static const H5VL_class_t null_vol_g = {
-    0,                                              /* version      */
-    NULL_VOL_CONNECTOR_VALUE,                       /* value        */
-    NULL_VOL_CONNECTOR_NAME,                        /* name         */
-    0,                                              /* capability flags */
-    NULL,                                           /* initialize   */
-    NULL,                                           /* terminate    */
-    (size_t)0,                                      /* info size    */
-    NULL,                                           /* info copy    */
-    NULL,                                           /* info compare */
-    NULL,                                           /* info free    */
-    NULL,                                           /* info to str  */
-    NULL,                                           /* str to info  */
-    NULL,                                           /* get_object   */
-    NULL,                                           /* get_wrap_ctx */
-    NULL,                                           /* wrap_object  */
-    NULL,                                           /* free_wrap_ctx */
-    {   /* attribute_cls */
-        NULL,                                       /* create       */
-        NULL,                                       /* open         */
-        NULL,                                       /* read         */
-        NULL,                                       /* write        */
-        NULL,                                       /* get          */
-        NULL,                                       /* specific     */
-        NULL,                                       /* optional     */
-        NULL                                        /* close        */
-    },
-    {   /* dataset_cls */
-        NULL,                                       /* create       */
-        NULL,                                       /* open         */
-        NULL,                                       /* read         */
-        NULL,                                       /* write        */
-        NULL,                                       /* get          */
-        NULL,                                       /* specific     */
-        NULL,                                       /* optional     */
-        NULL                                        /* close        */
-    },
-    {   /* datatype_cls */
-        NULL,                                       /* commit       */
-        NULL,                                       /* open         */
-        NULL,                                       /* get_size     */
-        NULL,                                       /* specific     */
-        NULL,                                       /* optional     */
-        NULL                                        /* close        */
-    },
-    {   /* file_cls */
-        H5VL_file_create,                           /* create       */
-        NULL,                                       /* open         */
-        NULL,                                       /* get          */
-        NULL,                                       /* specific     */
-        NULL,                                       /* optional     */
-        H5VL_file_close                             /* close        */
-    },
-    {   /* group_cls */
-        NULL,                                       /* create       */
-        NULL,                                       /* open         */
-        NULL,                                       /* get          */
-        NULL,                                       /* specific     */
-        NULL,                                       /* optional     */
-        NULL                                        /* close        */
-    },
-    {   /* link_cls */
-        NULL,                                       /* create       */
-        NULL,                                       /* copy         */
-        NULL,                                       /* move         */
-        NULL,                                       /* get          */
-        NULL,                                       /* specific     */
-        NULL                                        /* optional     */
-    },
-    {   /* object_cls */
-        NULL,                                       /* open         */
-        NULL,                                       /* copy         */
-        NULL,                                       /* get          */
-        NULL,                                       /* specific     */
-        NULL                                        /* optional     */
-    },
-    {   /* request_cls */
-        NULL,                                       /* wait         */
-        NULL,                                       /* notify       */
-        NULL,                                       /* cancel       */
-        NULL,                                       /* specific     */
-        NULL,                                       /* optional     */
-        NULL                                        /* free         */
-    },
-    NULL                                            /* optional     */
-};
-
-typedef struct H5VL_t {
-    void   *under_object;
-} H5VL_t;
-
-/* These two functions are necessary to load this plugin using
- * the HDF5 library.
- */
-
-H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_VOL;}
-const void *H5PLget_plugin_info(void) {return &null_vol_g;}
-
-static void *
-H5VL_file_create(const char *name)
-{
-    hid_t under_fapl;
-    H5VL_t *file;
-    
-    printf(" H5VL_file_create \n");
-
-    file = (H5VL_t *)calloc(1, sizeof(H5VL_t));
-
-    file->under_object = fopen(name, "w");
-
-    return (void *)file;
-}
-
-static herr_t 
-H5VL_file_close(void *file)
-{
-    H5VL_t *f = (H5VL_t *)file;
-
-    fclose(f->under_object);
-    free(f);
-
-    return 1;
-}
-
diff --git a/fortran/test/null_vol_connector.h b/fortran/test/null_vol_connector.h
deleted file mode 100644
index 11c8826..0000000
--- a/fortran/test/null_vol_connector.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* Purpose:     A simple virtual object layer (VOL) connector with almost no
- *              functionality that is used for testing basic plugin handling
- *              (registration, etc.).
- */
-
-#ifndef _null_vol_connector_H
-#define _null_vol_connector_H
-
-#define NULL_VOL_CONNECTOR_VALUE    ((H5VL_class_value_t)160)
-#define NULL_VOL_CONNECTOR_NAME     "null_vol_connector"
-
-#endif /* _null_vol_connector_H */
-
diff --git a/fortran/test/test_vol_connector.sh.in b/fortran/test/test_vol_connector.sh.in
deleted file mode 100644
index ee27f3b..0000000
--- a/fortran/test/test_vol_connector.sh.in
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.                                              
-# All rights reserved.                                                     
-#                                                                          
-# This file is part of HDF5. The full HDF5 copyright notice, including     
-# terms governing use, modification, and redistribution, is contained in   
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-#
-# This shell script is for testing VOL connector plugins.
-#
-srcdir=@srcdir@
-TOP_BUILDDIR=@top_builddir@
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-nerrors=0
-verbose=yes
-exit_code=$EXIT_SUCCESS
-
-TEST_NAME=vol_connector
-TEST_BIN=`pwd`/$TEST_NAME
-FROM_DIR=`pwd`/.libs
-case $(uname) in
-    CYGWIN* )
-        NULL_VOL_PLUGIN="$FROM_DIR/cygnull_vol_connector*"
-        ;;
-    *)
-        NULL_VOL_PLUGIN="$FROM_DIR/libnull_vol_connector*"
-        ;;
-esac
-TEMP_PLUGIN_DIR=null_vol_plugin_dir
-CP="cp -p -r"    # Use -p to preserve mode,ownership, timestamps
-RM="rm -rf"
-
-# Print a line-line message left justified in a field of 70 characters
-# beginning with the word "Testing".
-#
-TESTING() {
-    SPACES="                                                               "
-    echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
-}
-
-# Main Body
-# Create test directory if necessary.
-test -d $TEMP_PLUGIN_DIR || mkdir -p $TEMP_PLUGIN_DIR
-if [ $? != 0 ]; then
-    echo "Failed to create VOL connector plugin test directory ($TEMP_PLUGIN_DIR)"
-    exit $EXIT_FAILURE
-fi
-
-# Copy plugin for the tests.
-$CP $NULL_VOL_PLUGIN $TEMP_PLUGIN_DIR
-if [ $? != 0 ]; then
-    echo "Failed to copy NULL VOL plugin ($NULL_VOL_PLUGIN) to test directory."
-    exit $EXIT_FAILURE
-fi
-
-# setup plugin path
-ENVCMD="env HDF5_PLUGIN_PATH=${TEMP_PLUGIN_DIR}"
-
-# Run the test
-$ENVCMD $TEST_BIN
-if [ $? != 0 ]; then
-    nerrors=`expr $nerrors + 1`
-fi
-
-# print results
-if test $nerrors -ne 0 ; then
-    echo "$nerrors errors encountered"
-    exit_code=$EXIT_FAILURE
-else
-    echo "All VOL plugin tests passed."
-    exit_code=$EXIT_SUCCESS
-fi
-
-# Clean up temporary files/directories and leave
-#$RM $TEMP_PLUGIN_DIR
-
-exit $exit_code