diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-01-09 17:38:12 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-01-09 17:38:12 (GMT) |
| commit | f75d25707d0abf597bf341d5191bd7411f536bf0 (patch) | |
| tree | 1c68049ab219d890bcfa2252e7474df7e69e6cbe | |
| parent | f41195ba8e9674d6a21d057e796fc12354030664 (diff) | |
| parent | b3743a44238c284dc3817652271aa1475e3c4946 (diff) | |
| download | hdf5-f75d25707d0abf597bf341d5191bd7411f536bf0.zip hdf5-f75d25707d0abf597bf341d5191bd7411f536bf0.tar.gz hdf5-f75d25707d0abf597bf341d5191bd7411f536bf0.tar.bz2 | |
Merge pull request #1461 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'b3743a44238c284dc3817652271aa1475e3c4946':
fixed 8 byte integer issue
fix for xlf compiler
| -rw-r--r-- | fortran/src/H5Off.F90 | 11 | ||||
| -rw-r--r-- | fortran/src/H5_ff.F90 | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90 index 13dcf01..8c77230 100644 --- a/fortran/src/H5Off.F90 +++ b/fortran/src/H5Off.F90 @@ -69,6 +69,15 @@ MODULE H5O TYPE(mesg_t) :: mesg END TYPE hdr_t + TYPE, BIND(C) :: c_hdr_t + INTEGER(C_INT) :: version ! Version number of header format in file + INTEGER(C_INT) :: nmesgs ! Number of object header messages + INTEGER(C_INT) :: nchunks ! Number of object header chunks + INTEGER(C_INT) :: flags ! Object header status flags + TYPE(space_t) :: space + TYPE(mesg_t) :: mesg + END TYPE c_hdr_t + ! Extra metadata storage for obj & attributes TYPE, BIND(C) :: H5_ih_info_t INTEGER(hsize_t) :: index_size ! btree and/or list @@ -115,7 +124,7 @@ MODULE H5O INTEGER(hsize_t) :: num_attrs ! # of attributes attached to object - TYPE(hdr_t) :: hdr + TYPE(c_hdr_t) :: hdr TYPE(meta_size_t) :: meta_size END TYPE c_h5o_info_t diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90 index a66ac95..84529e4 100644 --- a/fortran/src/H5_ff.F90 +++ b/fortran/src/H5_ff.F90 @@ -940,10 +940,11 @@ CONTAINS INTEGER(C_INT), DIMENSION(:), POINTER :: c_time INTERFACE - TYPE(C_PTR) FUNCTION gmtime(stdtime_t) BIND(C, NAME='gmtime') + FUNCTION gmtime(stdtime_t) BIND(C, NAME='gmtime') IMPORT :: TIME_T, C_PTR IMPLICIT NONE INTEGER(KIND=TIME_T) :: stdtime_t + TYPE(C_PTR) :: gmtime END FUNCTION gmtime END INTERFACE |