summaryrefslogtreecommitdiffstats
path: root/src/H5Tconv.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-10 10:38:47 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-10 10:38:47 (GMT)
commitf1c17f305426190dc7027bc63fcb4d28b90ba89d (patch)
tree01dae80fe3aa79a3ee945e1390c1a1e9d7c8cf7c /src/H5Tconv.c
parent868cb97660cd668f3ff58c8935c74979ce404ce0 (diff)
downloadhdf5-f1c17f305426190dc7027bc63fcb4d28b90ba89d.zip
hdf5-f1c17f305426190dc7027bc63fcb4d28b90ba89d.tar.gz
hdf5-f1c17f305426190dc7027bc63fcb4d28b90ba89d.tar.bz2
[svn-r27741] Merge of r26606 from the trunk
Remove HW_FP_TO_LLONG_NOT_WORKS macro/define, it was only addressing Windows .NET 2003 compiler issues. Fixes HDFFV-9189. Tested on: jam (minor change that has baked in the trunk for months)
Diffstat (limited to 'src/H5Tconv.c')
-rw-r--r--src/H5Tconv.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index b42b724..49bfeec 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -8656,7 +8656,6 @@ H5_GCC_DIAG_ON(float-equal)
*
*-------------------------------------------------------------------------
*/
-#if H5T_CONV_INTERNAL_FP_LLONG
herr_t
H5T__conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@@ -8667,7 +8666,6 @@ H5_GCC_DIAG_OFF(float-equal)
H5T_CONV_Fx(FLOAT, LLONG, float, long long, LLONG_MIN, LLONG_MAX);
H5_GCC_DIAG_ON(float-equal)
}
-#endif /* H5T_CONV_INTERNAL_FP_LLONG */
/*-------------------------------------------------------------------------
@@ -8710,7 +8708,6 @@ H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*
*-------------------------------------------------------------------------
*/
-#if H5T_CONV_INTERNAL_FP_LLONG
herr_t
H5T__conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
@@ -8721,7 +8718,6 @@ H5_GCC_DIAG_OFF(float-equal)
H5T_CONV_Fx(DOUBLE, LLONG, double, long long, LLONG_MIN, LLONG_MAX);
H5_GCC_DIAG_ON(float-equal)
}
-#endif /*H5T_CONV_INTERNAL_FP_LLONG*/
/*-------------------------------------------------------------------------