summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2016-08-05 18:30:53 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2016-08-05 18:30:53 (GMT)
commita4e4094c766348c296d0dd8e1af38e28492528bf (patch)
tree5c146abcfed0fda204701aa16898967bba8306b6
parentf0365885b4bdd0f2ec198b70eeb43a7984ee7313 (diff)
downloadhdf5-a4e4094c766348c296d0dd8e1af38e28492528bf.zip
hdf5-a4e4094c766348c296d0dd8e1af38e28492528bf.tar.gz
hdf5-a4e4094c766348c296d0dd8e1af38e28492528bf.tar.bz2
[svn-r30259] Fixed: HDFFV-9965: HDF5 Fails to build when sizeof or c_sizeof is not available in Fortran
Added the use of 'storage_size' if 'c_sizeof' is not available. Tested (jelly, intel)
-rw-r--r--fortran/test/tf.F906
1 files changed, 5 insertions, 1 deletions
diff --git a/fortran/test/tf.F90 b/fortran/test/tf.F90
index e9baf43..219254b 100644
--- a/fortran/test/tf.F90
+++ b/fortran/test/tf.F90
@@ -339,7 +339,11 @@ CONTAINS
#ifdef H5_FORTRAN_HAVE_C_SIZEOF
H5_SIZEOF_CMPD = C_SIZEOF(a)
#else
- H5_SIZEOF_CMPD = SIZEOF(a)
+# ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
+ H5_SIZEOF_CMPD = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+# else
+ H5_SIZEOF_CMPD = SIZEOF(a)
+# endif
#endif
END FUNCTION H5_SIZEOF_CMPD