diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 20:28:03 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 20:28:03 (GMT) |
| commit | 0ea42d66677ffac366aec707fa448793ac5be6b6 (patch) | |
| tree | 19ee80047c6c7faf56c53bf64cd53ef45ace173a /src | |
| parent | fa367e4f582bcb06c9d58c79b805402cb455ddd7 (diff) | |
| download | hdf5-0ea42d66677ffac366aec707fa448793ac5be6b6.zip hdf5-0ea42d66677ffac366aec707fa448793ac5be6b6.tar.gz hdf5-0ea42d66677ffac366aec707fa448793ac5be6b6.tar.bz2 | |
[svn-r26624] Description:
Bring r26584 from trunk to 1.8 branch:
Bring r26485 from the autotools_rework branch to the trunk:
Remove the ULONG_TO_FLOAT_ACCURATE macro/define, we no longer support the
Sandia system where it was necessary.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(Daily tested on trunk for 2+ days)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Tpkg.h | 2 | ||||
| -rw-r--r-- | src/H5config.h.in | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 3b56ac4..24debe9 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -127,7 +127,7 @@ /* Define an internal macro for converting unsigned long to float. * Pathscale compiler on Sandia's Linux machine has some problem. * 64-bit Solaris does different rounding. */ -#if (H5_WANT_DATA_ACCURACY && H5_ULONG_TO_FLOAT_ACCURATE && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || \ +#if (H5_WANT_DATA_ACCURACY && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || \ (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_ULONG_FLT 1 #endif diff --git a/src/H5config.h.in b/src/H5config.h.in index 00fb8be..67c2bb0 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -580,10 +580,6 @@ correct precision. */ #undef ULLONG_TO_LDOUBLE_PRECISION -/* Define if your system accurately converting unsigned long to float values. - */ -#undef ULONG_TO_FLOAT_ACCURATE - /* Define if your system can accurately convert unsigned (long) long values to floating-point values. */ #undef ULONG_TO_FP_BOTTOM_BIT_ACCURATE |