summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-11-13 21:09:34 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-11-13 21:09:34 (GMT)
commit743c65ea9ca90f0fe2c8d9359c2b0a4b2d195086 (patch)
treec81fe6df3b12f488635430af07e2080bc2fdf97f
parentb4279178f9533fe15d1312620786b22deefe876f (diff)
downloadhdf5-743c65ea9ca90f0fe2c8d9359c2b0a4b2d195086.zip
hdf5-743c65ea9ca90f0fe2c8d9359c2b0a4b2d195086.tar.gz
hdf5-743c65ea9ca90f0fe2c8d9359c2b0a4b2d195086.tar.bz2
[svn-r12904] Description:
Clean up warnings from undefined macros... Tested on: Linux/64 2.6 (chicago2)
-rw-r--r--src/H5Tpkg.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 16fe983..0d70c69 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -143,23 +143,23 @@
/* 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 && !H5_HW_FP_TO_LLONG_NOT_WORKS) || (!H5_WANT_DATA_ACCURACY)
+#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 && !H5_HW_FP_TO_LLONG_NOT_WORKS && H5_LDOUBLE_TO_INTEGER_ACCURATE && \
+#if (H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS) && H5_LDOUBLE_TO_INTEGER_ACCURATE && \
H5_LDOUBLE_TO_INTEGER_WORKS && H5_LDOUBLE_TO_LLONG_ACCURATE) || \
- (!H5_WANT_DATA_ACCURACY && !H5_HW_FP_TO_LLONG_NOT_WORKS && H5_LDOUBLE_TO_INTEGER_WORKS)
+ (!H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS) && H5_LDOUBLE_TO_INTEGER_WORKS)
#define H5T_CONV_INTERNAL_LDOUBLE_LLONG 1
#endif
/* Define an internal macro for converting floating numbers to unsigned long long. PGI compiler does
* roundup when the source fraction part is greater than 0.5. HP-UX compilers set the maximal number
* for unsigned long long as 0x7fffffffffffffff during conversion. */
-#if (H5_WANT_DATA_ACCURACY && H5_FP_TO_ULLONG_ACCURATE && H5_FP_TO_ULLONG_RIGHT_MAXIMUM) || \
+#if (H5_WANT_DATA_ACCURACY && H5_FP_TO_ULLONG_ACCURATE && defined(H5_FP_TO_ULLONG_RIGHT_MAXIMUM)) || \
(!H5_WANT_DATA_ACCURACY)
#define H5T_CONV_INTERNAL_FP_ULLONG 1
#else
@@ -170,7 +170,7 @@
* incorrect conversions. Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates
* floating exception. */
#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_INTEGER_WORKS && \
- H5_FP_TO_ULLONG_ACCURATE && H5_FP_TO_ULLONG_RIGHT_MAXIMUM && H5_LDOUBLE_TO_LLONG_ACCURATE) || \
+ H5_FP_TO_ULLONG_ACCURATE && defined(H5_FP_TO_ULLONG_RIGHT_MAXIMUM) && H5_LDOUBLE_TO_LLONG_ACCURATE) || \
(!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS)
#define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 1
#else