Brings fortran changes from develop

19 files changed, 113 insertions, 89 deletions

diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
index 59e4451..f514c37 100644
--- a/fortran/src/H5Aff.F90
+++ b/fortran/src/H5Aff.F90
@@ -72,7 +72,7 @@
 
 MODULE H5A
 
-  USE, INTRINSIC :: ISO_C_BINDING
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_NULL_CHAR, C_LOC, C_INT
 
   USE H5GLOBAL
 
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index 2247818..7128698 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -87,7 +87,7 @@
 
 MODULE H5D
 
-  USE, INTRINSIC :: ISO_C_BINDING
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
   USE H5GLOBAL
 
   PRIVATE h5dread_vl_integer, h5dread_vl_real, h5dread_vl_string
@@ -959,7 +959,7 @@ CONTAINS
   SUBROUTINE h5dwrite_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
        hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1191,7 +1191,7 @@ CONTAINS
 
   SUBROUTINE h5dwrite_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1223,7 +1223,7 @@ CONTAINS
 
   SUBROUTINE h5dwrite_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1285,7 +1285,7 @@ CONTAINS
 
   SUBROUTINE h5dwrite_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1303,7 +1303,7 @@ CONTAINS
 
   SUBROUTINE h5dwrite_char_scalar_fix(dset_id, mem_type_id, buf, buf_len, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1336,7 +1336,7 @@ CONTAINS
 
   SUBROUTINE h5dread_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1431,7 +1431,7 @@ CONTAINS
 
   SUBROUTINE h5dread_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id         ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id   ! Memory datatype identifier
@@ -1461,7 +1461,7 @@ CONTAINS
 
   SUBROUTINE h5dread_char_scalar_fix(dset_id, mem_type_id, buf, buf_len, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1519,7 +1519,7 @@ CONTAINS
 !*****
   SUBROUTINE h5dwrite_ptr(dset_id, mem_type_id, buf, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1584,7 +1584,7 @@ CONTAINS
 !*****
   SUBROUTINE h5dread_ptr(dset_id, mem_type_id, buf, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -1638,7 +1638,7 @@ CONTAINS
 !
 
   SUBROUTINE h5dfill_integer(fill_value, space_id, buf,  hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER, INTENT(IN), TARGET :: fill_value  ! Fill value
     INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
@@ -1688,7 +1688,7 @@ CONTAINS
 !  March 12, 2003
 !
   SUBROUTINE h5dfill_c_float(fill_valuer, space_id, buf,  hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     REAL(KIND=C_FLOAT), INTENT(IN), TARGET :: fill_valuer  ! Fill value
     INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
@@ -1810,7 +1810,7 @@ CONTAINS
 !  March 12, 2003
 !
   SUBROUTINE h5dfill_char(fill_value, space_id, buf,  hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     CHARACTER, INTENT(IN), TARGET :: fill_value  ! Fill value
     INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index 8582f77..1e94c7a 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -264,7 +264,7 @@ CONTAINS
 !
 ! Fortran2003 Interface:
   SUBROUTINE h5eset_auto_f(printflag, hdferr, estack_id, func, client_data)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
     INTEGER       , INTENT(IN)            :: printflag
     INTEGER       , INTENT(OUT)           :: hdferr
     INTEGER(HID_T), INTENT(IN) , OPTIONAL :: estack_id
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index a25733a..84e1729 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -536,6 +536,7 @@ CONTAINS
     IF (flag .EQ. 0) status = .FALSE.
 
   END SUBROUTINE h5fis_hdf5_f
+
 !****s* H5F/h5fclose_f
 !
 ! NAME
diff --git a/fortran/src/H5Lff.F90 b/fortran/src/H5Lff.F90
index 526378c..eec748f 100644
--- a/fortran/src/H5Lff.F90
+++ b/fortran/src/H5Lff.F90
@@ -1345,7 +1345,7 @@ CONTAINS
 !
 ! Fortran2003 Interface:
   SUBROUTINE h5literate_f(group_id, index_type, order, idx, op, op_data, return_value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
     IMPLICIT NONE
     INTEGER(HID_T)  , INTENT(IN)    :: group_id
     INTEGER         , INTENT(IN)    :: index_type
@@ -1425,7 +1425,7 @@ CONTAINS
 ! Fortran2003 Interface:
   SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, &
        idx, op, op_data, return_value, hdferr, lapl_id)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
     IMPLICIT NONE
     INTEGER(HID_T)  , INTENT(IN)           :: loc_id
     CHARACTER(LEN=*), INTENT(IN)           :: group_name
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index 090619c..040c9f2 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -542,7 +542,7 @@ h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f
     HGOTO_DONE(FAIL);
 
   /*
-   * Call H5Ovisit
+   * Call H5Ovisit_by_name
    */
   func_ret_value = H5Ovisit_by_name2( (hid_t)*loc_id, c_object_name, (H5_index_t)*index_type, (H5_iter_order_t)*order,
                                       op, op_data, (unsigned)*fields, (hid_t)*lapl_id);
diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90
index b6b0dbf..46a9d74 100644
--- a/fortran/src/H5Off.F90
+++ b/fortran/src/H5Off.F90
@@ -966,7 +966,7 @@ CONTAINS
          CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER(SIZE_T) , INTENT(IN)  :: namelen
          INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
-         TYPE(C_PTR),VALUE             :: object_info
+         TYPE(C_PTR), VALUE            :: object_info
          INTEGER         , INTENT(IN)  :: fields
        END FUNCTION h5oget_info_by_name_c
     END INTERFACE
@@ -1010,7 +1010,7 @@ CONTAINS
 ! Fortran2003 Interface:
   SUBROUTINE h5oget_info_f(object_id, object_info, hdferr, fields)
 
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T)  , INTENT(IN)            :: object_id
     TYPE(h5o_info_t), INTENT(OUT), TARGET   :: object_info
@@ -1072,7 +1072,7 @@ CONTAINS
   SUBROUTINE h5oget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
        object_info, hdferr, lapl_id, fields)
 
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T)  , INTENT(IN)            :: loc_id
     CHARACTER(LEN=*), INTENT(IN)            :: group_name
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index c6f053f..dd5619e 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -38,7 +38,7 @@
 
 MODULE H5P
 
-  USE, INTRINSIC :: ISO_C_BINDING
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
   USE H5GLOBAL
   USE H5fortkit
 
@@ -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/H5Rff.F90 b/fortran/src/H5Rff.F90
index 6245590..e5cfb1d 100644
--- a/fortran/src/H5Rff.F90
+++ b/fortran/src/H5Rff.F90
@@ -341,7 +341,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
     CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the object at location specified
@@ -450,7 +450,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rcreate_ptr_f(loc_id, name, ref_type, ref, hdferr, space_id)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id     ! Location identifier
     CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of the dataset at location specified
@@ -498,7 +498,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rdereference_object_f(obj_id, ref, ref_obj_id, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: obj_id          ! Dataset identifier
     TYPE(hobj_ref_t_f), INTENT(IN), TARGET :: ref ! Object reference
@@ -541,7 +541,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rdereference_region_f(obj_id, ref, ref_obj_id, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: obj_id   ! Dataset identifier
     TYPE(hdset_reg_ref_t_f), INTENT(IN), TARGET :: ref   ! Object reference
@@ -582,7 +582,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rdereference_ptr_f(obj_id, ref_type, ref, ref_obj_id, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: obj_id  ! Valid identifier for the file containing the
                                           !  referenced object or any object in that file.
@@ -622,7 +622,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id
     TYPE(hobj_ref_t_f), INTENT(IN), TARGET :: ref
@@ -669,7 +669,7 @@ CONTAINS
 !
 ! Signature:
   SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id
     TYPE(hdset_reg_ref_t_f), INTENT(IN), TARGET :: ref
@@ -718,7 +718,7 @@ CONTAINS
   !
   ! Signature:
   SUBROUTINE h5rget_name_ptr_f(loc_id, ref_type, ref, name, hdferr, size)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id
     INTEGER, INTENT(IN) :: ref_type
@@ -767,7 +767,7 @@ CONTAINS
   !
   ! Signature:
   SUBROUTINE h5rget_obj_type_f(loc_id, ref_type, ref, obj_type, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id
     INTEGER, INTENT(IN) :: ref_type
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 0bafc58..ea5210c 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -994,8 +994,6 @@ done:
     return ret_value;
 }
 
-
-#ifdef NEW_HYPERSLAB_API
 /****if* H5Sf/h5scombine_hyperslab_c
  * NAME
  *  h5scombine_hyperslab_c
@@ -1118,11 +1116,11 @@ h5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_
   ret_value = 0;
   return ret_value;
 }
-/****if* H5Sf/h5sselect_select_c
+/****if* H5Sf/h5smodify_select_c
  * NAME
- *  h5sselect_select_c
+ *  h5smodify_select_c
  * PURPOSE
- *  Call H5Sselect_ select
+ *  Call H5Smodify_select
  * INPUTS
  *  space1_id - identifier of the first dataspace  to modify
  *  operator - defines how the new selection is combined
@@ -1138,7 +1136,7 @@ h5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_
 */
 
 int_f
-h5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id)
+h5smodify_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id)
 /******/
 {
   int ret_value = -1;
@@ -1150,11 +1148,11 @@ h5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id)
 
   c_space1_id = (hid_t)*space1_id;
   c_space2_id = (hid_t)*space2_id;
-  if( H5Sselect_select(c_space1_id, c_op, c_space2_id)< 0) return ret_value;
+  if( H5Smodify_select(c_space1_id, c_op, c_space2_id)< 0) return ret_value;
   ret_value = 0;
   return ret_value;
 }
-#endif /*NEW_HYPERSLAB_API*/
+
 /****if* H5Sf/h5sget_select_type_c
  * NAME
  *  h5sget_select_type_c
diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90
index 0c507ad..b821684 100644
--- a/fortran/src/H5Sff.F90
+++ b/fortran/src/H5Sff.F90
@@ -1506,7 +1506,7 @@ CONTAINS
 !  !$!****s* H5S/
 !  !$!
 !  !$! NAME
-!  !$!		h5sselect_select_f
+!  !$!		h5smodify_select_f
 !  !$!
 !  !$! PURPOSE
 !  !$!	Refine a hyperslab selection with an operation
@@ -1543,7 +1543,7 @@ CONTAINS
 !  !$!
 
 !  ! SOURCE
-!  SUBROUTINE h5sselect_select_f(space1_id, operator, space2_id, &
+!  SUBROUTINE h5smodify_select_f(space1_id, operator, space2_id, &
 !  hdferr)
 !  IMPLICIT NONE
 !  INTEGER(HID_T), INTENT(INOUT) :: space1_id ! Dataspace identifier to
@@ -1563,22 +1563,22 @@ CONTAINS
 !  INTEGER, INTENT(OUT) :: hdferr     ! Error code
 
 !  INTERFACE
-!  INTEGER FUNCTION h5sselect_select_c(space1_id, operator, &
+!  INTEGER FUNCTION h5smodify_select_c(space1_id, operator, &
 !  space2_id)
 !  USE H5GLOBAL
 !  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_SELECT_C'::h5sselect_select_c
+!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SMODIFY_SELECT_C'::h5smodify_select_c
 !  !DEC$ENDIF
 !  INTEGER(HID_T), INTENT(INOUT) :: space1_id
 !  INTEGER(HID_T), INTENT(IN) :: space2_id
 !  INTEGER, INTENT(IN) :: operator
-!  END FUNCTION h5sselect_select_c
+!  END FUNCTION h5smodify_select_c
 !  END INTERFACE
 
-!  hdferr = h5sselect_select_c(space1_id, operator, space2_id)
+!  hdferr = h5smodify_select_c(space1_id, operator, space2_id)
 !  return
 
-!  END SUBROUTINE h5sselect_select_f
+!  END SUBROUTINE h5smodify_select_f
 
 !
 !****s* H5S/h5sget_select_type_f
diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90
index f4b5545..e81e1c0 100644
--- a/fortran/src/H5_buildiface.F90
+++ b/fortran/src/H5_buildiface.F90
@@ -47,7 +47,7 @@
 #include <H5config_f.inc>
 
 PROGRAM H5_buildiface
-  USE, INTRINSIC :: ISO_C_BINDING
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_LOC
   IMPLICIT NONE
 
 ! These values are valid REAL KINDs (with corresponding C float) found during configure
@@ -135,7 +135,7 @@ PROGRAM H5_buildiface
 
   WRITE(11,'(A)') "MODULE H5_GEN"
 
-  WRITE(11,'(2X,A)') 'USE, INTRINSIC :: ISO_C_BINDING'
+  WRITE(11,'(2X,A)') 'USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_LOC'
   WRITE(11,'(2X,A)') 'USE H5GLOBAL'
 
   WRITE(11,'(2X,A)') 'USE H5A'
@@ -712,7 +712,6 @@ PROGRAM H5_buildiface
         WRITE(11,'(A)') '  SUBROUTINE h5dread_rkind_'//TRIM(ADJUSTL(chr2))&
              &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
         WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
-        WRITE(11,'(A)') '    USE, INTRINSIC :: ISO_C_BINDING'
         WRITE(11,'(A)') '    IMPLICIT NONE'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
@@ -752,7 +751,6 @@ PROGRAM H5_buildiface
         WRITE(11,'(A)') '  SUBROUTINE h5dread_ikind_'//TRIM(ADJUSTL(chr2))&
              &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
         WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
-        WRITE(11,'(A)') '    USE, INTRINSIC :: ISO_C_BINDING'
         WRITE(11,'(A)') '    IMPLICIT NONE'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
@@ -787,7 +785,6 @@ PROGRAM H5_buildiface
 ! Subroutine API
      WRITE(11,'(A)') '  SUBROUTINE h5dread_ckind_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
      WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
-     WRITE(11,'(A)') '    USE, INTRINSIC :: ISO_C_BINDING'
      WRITE(11,'(A)') '    IMPLICIT NONE'
      WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
      WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
@@ -827,7 +824,6 @@ PROGRAM H5_buildiface
         WRITE(11,'(A)') '  SUBROUTINE h5dwrite_rkind_'//TRIM(ADJUSTL(chr2))&
              &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
         WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
-        WRITE(11,'(A)') '    USE, INTRINSIC :: ISO_C_BINDING'
         WRITE(11,'(A)') '    IMPLICIT NONE'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
@@ -866,7 +862,6 @@ PROGRAM H5_buildiface
         WRITE(11,'(A)') '  SUBROUTINE h5dwrite_ikind_'//TRIM(ADJUSTL(chr2))&
              &//'_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
         WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
-        WRITE(11,'(A)') '    USE, INTRINSIC :: ISO_C_BINDING'
         WRITE(11,'(A)') '    IMPLICIT NONE'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
         WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
@@ -900,7 +895,6 @@ PROGRAM H5_buildiface
 ! Subroutine API
      WRITE(11,'(A)') '  SUBROUTINE h5dwrite_ckind_rank'//chr_rank(j)//'(dset_id, mem_type_id, buf, dims, hdferr, &'
      WRITE(11,'(A)') '       mem_space_id, file_space_id, xfer_prp)'
-     WRITE(11,'(A)') '    USE, INTRINSIC :: ISO_C_BINDING'
      WRITE(11,'(A)') '    IMPLICIT NONE'
      WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: dset_id'
      WRITE(11,'(A)') '    INTEGER(HID_T), INTENT(IN) :: mem_type_id'
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index 0592faf..5476209 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 = 16
   INTEGER, DIMENSION(1:H5I_FLAGS_LEN) :: H5I_flags
   !
   ! H5L flags declaration
@@ -444,13 +444,22 @@ 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_GENPROP_CLS_F = H5I_flags(10)
+    H5I_GENPROP_LST_F = H5I_flags(11)
+    H5I_ERROR_CLASS_F = H5I_flags(12)
+    H5I_ERROR_MSG_F   = H5I_flags(13)
+    H5I_ERROR_STACK_F = H5I_flags(14)
+    H5I_NTYPES_F      = H5I_flags(15)
+    H5I_INVALID_HID_F = H5I_flags(16)
     !
     ! H5L flags
     !
diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h
index eabe3d0..655cb9b 100644
--- a/fortran/src/H5f90.h
+++ b/fortran/src/H5f90.h
@@ -25,5 +25,8 @@
 
 /* Constants used in H5Gf.c files */
 #define OBJECT_NAMELEN_DEFAULT_F -1
+
 #define H5_MAX(a,b)            (((a)>(b)) ? (a) : (b))
+
 #endif /* _H5f90_H */
+
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 02ffcac..72b1802 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -435,15 +435,34 @@ 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_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_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
   !
@@ -781,7 +800,7 @@ CONTAINS
 
   SUBROUTINE H5_Fortran_string_c2f(c_string, f_string)
 
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR, C_NULL_CHAR
     IMPLICIT NONE
     CHARACTER(KIND=C_CHAR, LEN=*), INTENT(IN) :: c_string
     CHARACTER(LEN=*), INTENT(OUT) :: f_string
@@ -807,7 +826,7 @@ CONTAINS
 
   SUBROUTINE H5_Fortran_string_f2c(f_string, c_string)
 
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR, C_NULL_CHAR
     IMPLICIT NONE
     CHARACTER(LEN=*), INTENT(IN) :: f_string
     CHARACTER(KIND=C_CHAR, LEN=*), INTENT(OUT) :: c_string
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index 7d066cd..057edc5 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -21,8 +21,7 @@
  */
 #include "H5f90i_gen.h"
 
-/* Define _fcd.  These are the same on every system
- * but UNICOS.
+/* Define _fcd.  These are the same on every system but UNICOS.
  */
 #define _fcdtocp(desc) (desc)
 
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 92a0132..d88f1ad 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -123,7 +123,7 @@ H5_FCDLL int_f h5sget_select_type_c( hid_t_f *space_id , int_f *op);
 H5_FCDLL int_f h5sselect_elements_c( hid_t_f *space_id , int_f *op, size_t_f *nelements, hsize_t_f *coord);
 H5_FCDLL int_f h5scombine_hyperslab_c( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id);
 H5_FCDLL int_f h5scombine_select_c( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id);
-H5_FCDLL int_f h5sselect_select_c( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
+H5_FCDLL int_f h5smodify_select_c( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
 H5_FCDLL int_f h5sdecode_c( _fcd buf, hid_t_f *obj_id );
 H5_FCDLL int_f h5sencode_c(_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
 H5_FCDLL int_f h5sextent_equal_c( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal);
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 47ba3cd..d31d1ba 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -153,7 +153,9 @@ int main(void)
 
   int FORTRAN_NUM_INTEGER_KINDS=H5_FORTRAN_NUM_INTEGER_KINDS;
   int H5_FORTRAN_NUM_REAL_KINDS;
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE!=0
   int found_long_double = 0;
+#endif
 
   /* Open target files */
   c_header = fopen(CFILE, "w");
@@ -414,7 +416,7 @@ int main(void)
     return -1;
   }
 
-  /* Need the buffer size for the fortran derive type 'hdset_reg_ref_t_f03'
+  /* Need the buffer size for the fortran derived type 'hdset_reg_ref_t_f03'
    * in order to be interoperable with C's structure, the C buffer size
    * H5R_DSET_REG_REF_BUF_SIZE is (sizeof(haddr_t)+4)
    */
diff --git a/fortran/src/README b/fortran/src/README
index a258e07..f9316b5 100644
--- a/fortran/src/README
+++ b/fortran/src/README
@@ -87,7 +87,7 @@ Quick overview of the Fortran APIs
    to the file, a C program will read it as a 6x4 two-dimensional dataset into 
    memory.  The HDF5 C utilities h5dump and h5ls display transposed data, if
    data is written from a Fortran program.
- 
+
 *  Fortran indices are 1 based.
 
 ============================
@@ -105,29 +105,29 @@ Procedure to add a new function
 Procedure for passing C variables to Fortran
 ---------------------------------------------
 
-(1) Find the C struct name you are interested in: 
+(1) Find the C struct name you are interested in:
 	(a) src/H5public.h if it is a generic type, i.e. H5_*
             or
-        (b) src/H5*public.h if is a specific type, i.e. H5*_ 
-                            
+        (b) src/H5*public.h if is a specific type, i.e. H5*_
+
 (2) Put that structure into an array that will be passed to fortran in:
         (a) fortran/src/H5_f.c (add to nh5init_flags_c subroutine)
         (b) edit fortran/src/H5f90proto.h and edit nh5init_flags_c interface call
-                         
+
 (3) Edit the function call in fortran/src/H5_ff.F90
-        (a) edit the call:  FUNCTION h5init_flags_c 
+        (a) edit the call:  FUNCTION h5init_flags_c
         (b) edit h5init_flags_c call in h5open_f to match the number of arguments passing
-                             
-(4) add the size of the array and array to fortran/src/H5f90global.F90 
+
+(4) add the size of the array and array to fortran/src/H5f90global.F90
          - must match the size found it H5_f.c
 
-NOTE: To just add a default C value argument, do steps (2a) and (4) 
+NOTE: To just add a default C value argument, do steps (2a) and (4)
 
 
 Procedure for adding a new file to the repository
 --------------------------------------------------
 
-Add the name of the file to the: 
+Add the name of the file to the:
     (1) Makefile.am located in the same directory as the newfile
     (2) CMakeLists.txt located in the same directory as the newfile
     (3) MANIFEST located in the top level directory