diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-07-05 18:35:03 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-07-05 18:35:03 (GMT) |
| commit | 63647cd36336e35cac95c9ed4ab48deadee8ebd0 (patch) | |
| tree | 90e5be9bc1b17c792d2e3e83b22acef933313f8f /m4 | |
| parent | 7e9d5c2c3727a8d17e81c25ad8106d35f55f329d (diff) | |
| download | hdf5-63647cd36336e35cac95c9ed4ab48deadee8ebd0.zip hdf5-63647cd36336e35cac95c9ed4ab48deadee8ebd0.tar.gz hdf5-63647cd36336e35cac95c9ed4ab48deadee8ebd0.tar.bz2 | |
Merge of recent develop work to 1.10 branch.
Fixes for:
* HDFFV-10247 (autotools Fortran long double bug)
* HDFFV-10248 (autotools deprecated debug/production tweak)
* HDFFV-10250 (-fno-omit-frame-pointer w/ symbols)
* Disabled missing parameter warnings in Java constant code
* Added H5I_VFL ID checks to tmisc.c
* Added 'get a dummy VFD' call to h5test library
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/aclocal_fc.f90 | 2 | ||||
| -rw-r--r-- | m4/aclocal_fc.m4 | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/m4/aclocal_fc.f90 b/m4/aclocal_fc.f90 index 4c58e4e..664a3c6 100644 --- a/m4/aclocal_fc.f90 +++ b/m4/aclocal_fc.f90 @@ -58,7 +58,7 @@ END PROGRAM PROG_FC_HAVE_F2003_REQUIREMENTS !---- START ----- Check to see C_LONG_DOUBLE is different from C_DOUBLE MODULE type_mod USE ISO_C_BINDING - INTERFACE h5t + INTERFACE h5t MODULE PROCEDURE h5t_c_double MODULE PROCEDURE h5t_c_long_double END INTERFACE diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4 index 0bf3cb1..ab45bbc 100644 --- a/m4/aclocal_fc.m4 +++ b/m4/aclocal_fc.m4 @@ -476,4 +476,3 @@ rm -f pac_Cconftest.out ],[]) ]) - |