diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2006-04-17 22:09:29 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2006-04-17 22:09:29 (GMT) |
| commit | f4b3fc64eb822305832579960143ce5066f75eed (patch) | |
| tree | b7883de90cfcd0a36cc22b62a129d31dacacfbfc /fortran | |
| parent | 8d5bb57464e463d568b8af3fec047f7faf4c1ba8 (diff) | |
| download | hdf5-f4b3fc64eb822305832579960143ce5066f75eed.zip hdf5-f4b3fc64eb822305832579960143ce5066f75eed.tar.gz hdf5-f4b3fc64eb822305832579960143ce5066f75eed.tar.bz2 | |
[svn-r12270] Purpose: Bug fix (it is quite serious, so I decided to check the fix in)
Description: H5match_types uses reserved "INT" string and writes it
to the H5H5fortran_types.f90 file. If application uses
Fortran intrinsic INT and HDF5, compilation fails since
it becomes redefined in H5H5fortran_types.f90.
Solution: Rename INT to Fortran_INTEGER
Platforms tested: copper, shanti, heping with g95
Misc. update:
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5match_types.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c index d9a93d2..597f467 100644 --- a/fortran/src/H5match_types.c +++ b/fortran/src/H5match_types.c @@ -350,13 +350,13 @@ int main() /* int */ #if defined H5_FORTRAN_HAS_NATIVE_8 - writeToFiles("INT", "int_f", 8); + writeToFiles("Fortran_INTEGER", "int_f", 8); #elif defined H5_FORTRAN_HAS_NATIVE_4 - writeToFiles("INT", "int_f", 4); + writeToFiles("Fortran_INTEGER", "int_f", 4); #elif defined H5_FORTRAN_HAS_NATIVE_2 - writeToFiles("INT", "int_f", 2); + writeToFiles("Fortran_INTEGER", "int_f", 2); #elif defined H5_FORTRAN_HAS_NATIVE_1 - writeToFiles("INT", "int_f", 1); + writeToFiles("Fortran_INTEGER", "int_f", 1); #else /* Error: couldn't find a size for int */ return -1; |