diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-24 22:10:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-24 22:10:02 (GMT) |
| commit | 5d9c34406afad17f64a8feb8d5b46114286989f0 (patch) | |
| tree | e4803ddf0491acbd1bc62404142cfbd94c6479e6 /test | |
| parent | 08d0edb920ae93f4d2494831479ad6200ff208b5 (diff) | |
| download | hdf5-5d9c34406afad17f64a8feb8d5b46114286989f0.zip hdf5-5d9c34406afad17f64a8feb8d5b46114286989f0.tar.gz hdf5-5d9c34406afad17f64a8feb8d5b46114286989f0.tar.bz2 | |
[svn-r26561] Description:
Bring r26491 from trunk to 1.8 branch:
Bring r26257 from autotools_rework branch back to the trunk - removes
the LDOUBLE_TO_INTEGER_ACCURATE macro/define, which was addressing problems
with SGI systems and is no longer supported.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
Daily tested on branch for >2 weeks.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dt_arith.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c index 6ba9aa3..cb3f495 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -5338,7 +5338,7 @@ run_fp_int_conv(const char *name) #endif /*H5_FP_TO_ULLONG_RIGHT_MAXIMUM*/ #endif -#if H5_LDOUBLE_TO_INTEGER_WORKS && H5_LDOUBLE_TO_INTEGER_ACCURATE +#if H5_LDOUBLE_TO_INTEGER_WORKS #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR); @@ -5420,7 +5420,7 @@ run_fp_int_conv(const char *name) #endif /*H5_FP_TO_ULLONG_RIGHT_MAXIMUM && H5_LDOUBLE_TO_LLONG_ACCURATE*/ #endif #endif -#else /*H5_LDOUBLE_TO_INTEGER_WORKS && H5_LDOUBLE_TO_INTEGER_ACCURATE*/ +#else /*H5_LDOUBLE_TO_INTEGER_WORKS*/ { char str[256]; /*hello string */ @@ -5434,7 +5434,7 @@ run_fp_int_conv(const char *name) HDputs(" Test skipped due to disabled long double."); #endif } -#endif /*H5_LDOUBLE_TO_INTEGER_WORKS && H5_LDOUBLE_TO_INTEGER_ACCURATE*/ +#endif /*H5_LDOUBLE_TO_INTEGER_WORKS */ #ifndef H5_VMS } /* end for */ #endif /* H5_VMS */ |