From f4b3fc64eb822305832579960143ce5066f75eed Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Mon, 17 Apr 2006 17:09:29 -0500 Subject: [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: --- fortran/src/H5match_types.c | 8 ++++---- 1 file 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; -- cgit v0.12