summaryrefslogtreecommitdiffstats
path: root/src/H5Tpkg.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-03-26 19:13:13 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-03-26 19:13:13 (GMT)
commitc4ec20a6de26d3f748dc87d15226961983fc81c3 (patch)
tree6aa58c70823088cd59e6bceb46941cdb8d86c6ec /src/H5Tpkg.h
parent39373fbabbcbd6b14f66f20582fd5d759f63440a (diff)
downloadhdf5-c4ec20a6de26d3f748dc87d15226961983fc81c3.zip
hdf5-c4ec20a6de26d3f748dc87d15226961983fc81c3.tar.gz
hdf5-c4ec20a6de26d3f748dc87d15226961983fc81c3.tar.bz2
[svn-r26606] Description:
Bring r26508 from autotools_rework branch to trunk: Remove HW_FP_TO_LLONG_NOT_WORKS macro/define, it was only addressing Windows .NET 2003 compiler issues. Tested on: Linux/32 2.6.18 (jam) w/serial & parallel (Daily tested on branch for 2+ days)
Diffstat (limited to 'src/H5Tpkg.h')
-rw-r--r--src/H5Tpkg.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 958462b..0b0cd61 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -126,18 +126,11 @@
#define H5T_CONV_INTERNAL_ULLONG_LDOUBLE 1
#endif
-/* Define an internal macro for converting floating numbers to long long. The hard conversion on Windows
- * .NET 2003 has a bug and gives wrong exception value. */
-#if (H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS)) || (!H5_WANT_DATA_ACCURACY)
-#define H5T_CONV_INTERNAL_FP_LLONG 1
-#endif
-
/* Define an internal macro for converting long double to long long. SGI compilers give some incorrect
* conversions. Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates floating exception.
* The hard conversion on Windows .NET 2003 has a bug and gives wrong exception value. */
-#if (H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS) && \
- defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \
- (!H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS))
+#if (H5_WANT_DATA_ACCURACY && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \
+ (!H5_WANT_DATA_ACCURACY)
#define H5T_CONV_INTERNAL_LDOUBLE_LLONG 1
#endif