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/H5Tconv.c | |
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/H5Tconv.c')
-rw-r--r-- | src/H5Tconv.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index d84d546..e81f17d 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -7932,7 +7932,6 @@ H5T__conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, * *------------------------------------------------------------------------- */ -#if H5T_CONV_INTERNAL_ULLONG_FP herr_t H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7941,7 +7940,6 @@ H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -); } -#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/ /*------------------------------------------------------------------------- @@ -7959,7 +7957,6 @@ H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, * *------------------------------------------------------------------------- */ -#if H5T_CONV_INTERNAL_ULLONG_FP herr_t H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7968,7 +7965,6 @@ H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -); } -#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/ /*------------------------------------------------------------------------- |