From ca9591caed818c4c4a9a2e1606f7bd49422c1bb3 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 9 Apr 2003 15:02:33 -0500 Subject: [svn-r6617] Purpose: Bug fix. Description: The macro MAX defined here is very commonly defined, e.g., AIX systems. The compiler did not like duplicated macro defines. Solution: H5_MAX is already defined in H5f90.h and used in other code. Remove MAX and change its use to H5_MAX. Platforms tested: "h5committested", plus tested at LLNL Blue. Misc. update: --- fortran/src/H5Df.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c index 4ee4a75..3f2e5b9 100644 --- a/fortran/src/H5Df.c +++ b/fortran/src/H5Df.c @@ -1,5 +1,4 @@ #include "H5f90.h" -#define MAX(a,b) (((a)>(b)) ? (a) : (b)) /*---------------------------------------------------------------------------- * Name: h5dcreate_c @@ -1082,7 +1081,7 @@ nh5dvlen_get_max_len_c ( hid_t_f *dset_id , hid_t_f *type_id, hid_t_f *space_id if(H5Dread(c_dset_id, c_type_id, H5S_ALL, c_space_id, H5P_DEFAULT, c_buf)) goto DONE; c_len = 0; - for (i=0; i < num_elem; i++) c_len = MAX(c_len, c_buf[i].len); + for (i=0; i < num_elem; i++) c_len = H5_MAX(c_len, c_buf[i].len); *len = (size_t_f)c_len; ret_value = 0; -- cgit v0.12