diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-28 00:42:13 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-28 00:42:13 (GMT) |
| commit | 03f3e620bbea7dd1474c42150d05817f14d23783 (patch) | |
| tree | fa181a4ef5b23ab998748f12a550a11b6ef9d695 /src/H5Tpkg.h | |
| parent | 46f59e4fd4309862727dc72409476fdb76239961 (diff) | |
| download | hdf5-03f3e620bbea7dd1474c42150d05817f14d23783.zip hdf5-03f3e620bbea7dd1474c42150d05817f14d23783.tar.gz hdf5-03f3e620bbea7dd1474c42150d05817f14d23783.tar.bz2 | |
[svn-r26636] Description:
Bring r26596 from trunk to 1.8 branch:
Bring r26499 from autotools_rework branch to trunk:
Remove ULLONG_TO_FP_CAST_WORKS macro/define, as it only applies to older
platforms we aren't supporting any longer.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(Daily tested on trunk for 2+ days)
Diffstat (limited to 'src/H5Tpkg.h')
| -rw-r--r-- | src/H5Tpkg.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index a4f8b8c..ffcfe0a 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -130,22 +130,13 @@ #define H5T_CONV_INTERNAL_LLONG_LDOUBLE 1 #endif -/* Define an internal macro for converting unsigned long long to floating numbers. SGI compilers give - * some incorect conversion. 64-bit Solaris does different rounding. Windows Visual Studio 6 does - * not support unsigned long long. */ -#if (H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS) || \ - (!H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS) -#define H5T_CONV_INTERNAL_ULLONG_FP 1 -#endif - /* Define an internal macro for converting unsigned long long to long double. SGI compilers give * some incorect conversion. 64-bit Solaris does different rounding. Windows Visual Studio 6 does * not support unsigned long long. For FreeBSD(sleipnir), the last 2 bytes of mantissa are lost when * compiler tries to do the conversion. For Cygwin, compiler doesn't do rounding correctly. * Mac OS 10.4 gives some incorrect result. */ -#if (H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS && \ - defined(H5_ULLONG_TO_LDOUBLE_PRECISION) && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || (!H5_WANT_DATA_ACCURACY && \ - H5_ULLONG_TO_FP_CAST_WORKS) +#if (H5_WANT_DATA_ACCURACY && \ + defined(H5_ULLONG_TO_LDOUBLE_PRECISION) && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_ULLONG_LDOUBLE 1 #endif |