2 files changed, 66 insertions, 64 deletions
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 8d17ff0..0247ad8 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -89,50 +89,50 @@ MODULE H5GLOBAL
   INTEGER(HID_T), DIMENSION(1:FLOATING_TYPES_LEN) :: floating_types = -1
   INTEGER(HID_T), DIMENSION(1:INTEGER_TYPES_LEN)  :: integer_types = -1
   !
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_FLOAT = -1
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_DOUBLE = -1
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_LONG_DOUBLE = -1
-  INTEGER(HID_T) :: H5T_NATIVE_INTEGER = -1
-  INTEGER(HID_T) :: H5T_NATIVE_REAL = -1
-  INTEGER(HID_T) :: H5T_NATIVE_DOUBLE = -1
-  INTEGER(HID_T) :: H5T_NATIVE_CHARACTER  = -1
-  INTEGER(HID_T) :: H5T_STD_REF_OBJ = -1
-  INTEGER(HID_T) :: H5T_STD_REF_DSETREG = -1
-  INTEGER(HID_T) :: H5T_IEEE_F32BE = -1
-  INTEGER(HID_T) :: H5T_IEEE_F32LE = -1
-  INTEGER(HID_T) :: H5T_IEEE_F64BE = -1
-  INTEGER(HID_T) :: H5T_IEEE_F64LE = -1
-  INTEGER(HID_T) :: H5T_STD_I8BE = -1
-  INTEGER(HID_T) :: H5T_STD_I8LE = -1
-  INTEGER(HID_T) :: H5T_STD_I16BE = -1
-  INTEGER(HID_T) :: H5T_STD_I16LE = -1
-  INTEGER(HID_T) :: H5T_STD_I32BE = -1
-  INTEGER(HID_T) :: H5T_STD_I32LE = -1
-  INTEGER(HID_T) :: H5T_STD_I64BE = -1
-  INTEGER(HID_T) :: H5T_STD_I64LE = -1
-  INTEGER(HID_T) :: H5T_STD_U8BE = -1
-  INTEGER(HID_T) :: H5T_STD_U8LE = -1
-  INTEGER(HID_T) :: H5T_STD_U16BE = -1
-  INTEGER(HID_T) :: H5T_STD_U16LE = -1
-  INTEGER(HID_T) :: H5T_STD_U32BE = -1
-  INTEGER(HID_T) :: H5T_STD_U32LE = -1
-  INTEGER(HID_T) :: H5T_STD_U64BE = -1
-  INTEGER(HID_T) :: H5T_STD_U64LE = -1
-  INTEGER(HID_T) :: H5T_STRING = -1
-  INTEGER(HID_T) :: H5T_STD_B8BE = -1
-  INTEGER(HID_T) :: H5T_STD_B8LE = -1
-  INTEGER(HID_T) :: H5T_STD_B16BE = -1
-  INTEGER(HID_T) :: H5T_STD_B16LE = -1
-  INTEGER(HID_T) :: H5T_STD_B32BE = -1
-  INTEGER(HID_T) :: H5T_STD_B32LE = -1
-  INTEGER(HID_T) :: H5T_STD_B64BE = -1
-  INTEGER(HID_T) :: H5T_STD_B64LE = -1
-  INTEGER(HID_T) :: H5T_NATIVE_B8 = -1
-  INTEGER(HID_T) :: H5T_NATIVE_B16 = -1
-  INTEGER(HID_T) :: H5T_NATIVE_B32 = -1
-  INTEGER(HID_T) :: H5T_NATIVE_B64 = -1
-  INTEGER(HID_T) :: H5T_FORTRAN_S1 = -1
-  INTEGER(HID_T) :: H5T_C_S1 = -1
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_FLOAT
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_LONG_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_INTEGER
+  INTEGER(HID_T) :: H5T_NATIVE_REAL
+  INTEGER(HID_T) :: H5T_NATIVE_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_CHARACTER 
+  INTEGER(HID_T) :: H5T_STD_REF_OBJ
+  INTEGER(HID_T) :: H5T_STD_REF_DSETREG
+  INTEGER(HID_T) :: H5T_IEEE_F32BE
+  INTEGER(HID_T) :: H5T_IEEE_F32LE
+  INTEGER(HID_T) :: H5T_IEEE_F64BE
+  INTEGER(HID_T) :: H5T_IEEE_F64LE
+  INTEGER(HID_T) :: H5T_STD_I8BE
+  INTEGER(HID_T) :: H5T_STD_I8LE
+  INTEGER(HID_T) :: H5T_STD_I16BE
+  INTEGER(HID_T) :: H5T_STD_I16LE
+  INTEGER(HID_T) :: H5T_STD_I32BE
+  INTEGER(HID_T) :: H5T_STD_I32LE
+  INTEGER(HID_T) :: H5T_STD_I64BE
+  INTEGER(HID_T) :: H5T_STD_I64LE
+  INTEGER(HID_T) :: H5T_STD_U8BE
+  INTEGER(HID_T) :: H5T_STD_U8LE
+  INTEGER(HID_T) :: H5T_STD_U16BE
+  INTEGER(HID_T) :: H5T_STD_U16LE
+  INTEGER(HID_T) :: H5T_STD_U32BE
+  INTEGER(HID_T) :: H5T_STD_U32LE
+  INTEGER(HID_T) :: H5T_STD_U64BE
+  INTEGER(HID_T) :: H5T_STD_U64LE
+  INTEGER(HID_T) :: H5T_STRING
+  INTEGER(HID_T) :: H5T_STD_B8BE
+  INTEGER(HID_T) :: H5T_STD_B8LE
+  INTEGER(HID_T) :: H5T_STD_B16BE
+  INTEGER(HID_T) :: H5T_STD_B16LE
+  INTEGER(HID_T) :: H5T_STD_B32BE
+  INTEGER(HID_T) :: H5T_STD_B32LE
+  INTEGER(HID_T) :: H5T_STD_B64BE
+  INTEGER(HID_T) :: H5T_STD_B64LE
+  INTEGER(HID_T) :: H5T_NATIVE_B8
+  INTEGER(HID_T) :: H5T_NATIVE_B16
+  INTEGER(HID_T) :: H5T_NATIVE_B32
+  INTEGER(HID_T) :: H5T_NATIVE_B64
+  INTEGER(HID_T) :: H5T_FORTRAN_S1
+  INTEGER(HID_T) :: H5T_C_S1
 
   INTEGER, PARAMETER :: NUM_NATIVE_INTEGER_KIND = 5
   ! INTEGER*1, INTEGER*2, INTEGER*4, INTEGER*8, INTEGER*16
@@ -156,25 +156,25 @@ MODULE H5GLOBAL
   !
   ! H5F flags declaration
   !
-  INTEGER :: H5F_ACC_RDWR_F = -1
-  INTEGER :: H5F_ACC_RDONLY_F = -1
-  INTEGER :: H5F_ACC_TRUNC_F = -1
-  INTEGER :: H5F_ACC_EXCL_F = -1
-  INTEGER :: H5F_ACC_DEBUG_F = -1
-  INTEGER :: H5F_SCOPE_LOCAL_F = -1
-  INTEGER :: H5F_SCOPE_GLOBAL_F = -1
-  INTEGER :: H5F_CLOSE_DEFAULT_F = -1
-  INTEGER :: H5F_CLOSE_WEAK_F = -1
-  INTEGER :: H5F_CLOSE_SEMI_F = -1
-  INTEGER :: H5F_CLOSE_STRONG_F = -1
-  INTEGER :: H5F_OBJ_FILE_F = -1
-  INTEGER :: H5F_OBJ_DATASET_F = -1
-  INTEGER :: H5F_OBJ_GROUP_F = -1
-  INTEGER :: H5F_OBJ_DATATYPE_F = -1
-  INTEGER :: H5F_OBJ_ALL_F = -1
-  INTEGER :: H5F_LIBVER_EARLIEST_F = -1
-  INTEGER :: H5F_LIBVER_LATEST_F = -1
-  INTEGER :: H5F_UNLIMITED_F = -1
+  INTEGER :: H5F_ACC_RDWR_F
+  INTEGER :: H5F_ACC_RDONLY_F
+  INTEGER :: H5F_ACC_TRUNC_F
+  INTEGER :: H5F_ACC_EXCL_F
+  INTEGER :: H5F_ACC_DEBUG_F
+  INTEGER :: H5F_SCOPE_LOCAL_F
+  INTEGER :: H5F_SCOPE_GLOBAL_F
+  INTEGER :: H5F_CLOSE_DEFAULT_F
+  INTEGER :: H5F_CLOSE_WEAK_F
+  INTEGER :: H5F_CLOSE_SEMI_F
+  INTEGER :: H5F_CLOSE_STRONG_F
+  INTEGER :: H5F_OBJ_FILE_F
+  INTEGER :: H5F_OBJ_DATASET_F
+  INTEGER :: H5F_OBJ_GROUP_F
+  INTEGER :: H5F_OBJ_DATATYPE_F
+  INTEGER :: H5F_OBJ_ALL_F
+  INTEGER :: H5F_LIBVER_EARLIEST_F
+  INTEGER :: H5F_LIBVER_LATEST_F
+  INTEGER :: H5F_UNLIMITED_F
   !
   ! H5G flags declaration
   !
@@ -258,7 +258,7 @@ MODULE H5GLOBAL
   INTEGER :: H5FD_MEM_GHEAP_F
   INTEGER :: H5FD_MEM_LHEAP_F
   INTEGER :: H5FD_MEM_OHDR_F
-  INTEGER :: H5FD_MEM_NTYPES_F
+  INTEGER :: H5FD_MEM_NTYPES_F=-1
   INTEGER(HID_T) :: H5FD_CORE_F
   INTEGER(HID_T) :: H5FD_FAMILY_F
   INTEGER(HID_T) :: H5FD_LOG_F
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 3a5a91f..43a802c 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -1,4 +1,6 @@
 EXPORTS
+; H5GLOBAL
+H5GLOBAL_mp_H5FD_MEM_NTYPES_F
 ; H5LIB
 H5LIB_mp_H5OPEN_F
 H5LIB_mp_H5CLOSE_F