diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-10 10:38:47 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-10 10:38:47 (GMT) |
| commit | f1c17f305426190dc7027bc63fcb4d28b90ba89d (patch) | |
| tree | 01dae80fe3aa79a3ee945e1390c1a1e9d7c8cf7c /src/H5Tpkg.h | |
| parent | 868cb97660cd668f3ff58c8935c74979ce404ce0 (diff) | |
| download | hdf5-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/H5Tpkg.h')
| -rw-r--r-- | src/H5Tpkg.h | 11 |
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 |