mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-13 16:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6617] Purpose:

Browse Source 
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:
This commit is contained in:
Albert Cheng 2003-04-09 15:02:33 -05:00
parent 33bad44a26
commit ca9591caed
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fortran/src/H5Df.c
View File

@ -1,5 +1,4 @@
#include "H5f90.h" #include "H5f90.h"
#define MAX(a,b) (((a)>(b)) ? (a) : (b))
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Name: h5dcreate_c * 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; if(H5Dread(c_dset_id, c_type_id, H5S_ALL, c_space_id, H5P_DEFAULT, c_buf)) goto DONE;
c_len = 0; 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; *len = (size_t_f)c_len;
ret_value = 0; ret_value = 0;