diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-03 15:54:16 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-03 15:54:16 (GMT) |
commit | 65dc3358db37b04cc64b65b88065cbaf48e63a8b (patch) | |
tree | 41244d303977ed2870388bd782da9d19fc543270 /tools/lib | |
parent | 33a65add7db18a4efd2b34ac8261c2065820ebf9 (diff) | |
download | hdf5-65dc3358db37b04cc64b65b88065cbaf48e63a8b.zip hdf5-65dc3358db37b04cc64b65b88065cbaf48e63a8b.tar.gz hdf5-65dc3358db37b04cc64b65b88065cbaf48e63a8b.tar.bz2 |
[svn-r16537] Description:
Merge r16500:16536 from trunk into revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.6 (amazon) in debug mode
Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/Makefile.in | 1 | ||||
-rw-r--r-- | tools/lib/h5diff_array.c | 21 |
2 files changed, 16 insertions, 6 deletions
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 721a393..b08c0a3 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -239,6 +239,7 @@ USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ VERSION = @VERSION@ +WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 5d57a52..ebf541e 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -156,13 +156,22 @@ static void h5diff_print_char(char ch); * NaN detection *------------------------------------------------------------------------- */ + +#if H5_SIZEOF_LONG_DOUBLE !=0 typedef enum dtype_t { - FLT_FLOAT, FLT_DOUBLE, -#if H5_SIZEOF_LONG_DOUBLE !=0 - FLT_LDOUBLE, -#endif + FLT_FLOAT, + FLT_DOUBLE, + FLT_LDOUBLE } dtype_t; +#else + +typedef enum dtype_t +{ + FLT_FLOAT, + FLT_DOUBLE +} dtype_t; +#endif static int my_isnan(dtype_t type, void *val); @@ -356,9 +365,9 @@ hsize_t diff_array( void *_mem1, * H5T_COMPOUND * Recursively call this function for each member * H5T_ARRAY - * Recursively call this function for each element� + * Recursively call this function for each element * H5T_VLEN - * Recursively call this function for each element� + * Recursively call this function for each element * H5T_STRING * compare byte by byte in a cycle from 0 to type_size. this type_size is the * value obtained by the get_size function but it is the string lenght for |