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/H5T.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/H5T.c')
-rw-r--r-- | src/H5T.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1234,10 +1234,8 @@ H5T_init_interface(void) #endif /* H5T_CONV_INTERNAL_LLONG_LDOUBLE */ /* From unsigned long long to floats */ -#if H5T_CONV_INTERNAL_ULLONG_FP status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T__conv_ullong_float, H5AC_dxpl_id, FALSE); status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T__conv_ullong_double, H5AC_dxpl_id, FALSE); -#endif /* H5T_CONV_INTERNAL_ULLONG_FP */ #ifdef H5T_CONV_INTERNAL_ULLONG_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "ullong_ldbl", native_ullong, native_ldouble, H5T__conv_ullong_ldouble, H5AC_dxpl_id, FALSE); #endif /* H5T_CONV_INTERNAL_ULLONG_LDOUBLE */ |