summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5Ztrans.c2
-rw-r--r--test/dtransform.c4
-rwxr-xr-xwindows/src/H5pubconf.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index b4b8a9d..b1c3487 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -161,7 +161,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
/* Windows Intel 8.1 compiler has error converting long long to double.
* Hard code it in.
*/
-#ifdef H5_LLONG_TO_FP_CAST_BROKEN
+#ifndef H5_LLONG_TO_FP_CAST_WORKS
#define H5Z_XFORM_LL_DO_OP1(RESL,RESR,TYPE,OP,SIZE) \
{ \
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot convert from long long to double: required for data transform") \
diff --git a/test/dtransform.c b/test/dtransform.c
index 3a160d8..3ae8520 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -247,7 +247,7 @@ int main(void)
TEST_TYPE_CONTIG(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1);
TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
-#ifndef H5_LLONG_TO_FP_CAST_BROKEN
+#ifdef H5_LLONG_TO_FP_CAST_WORKS
TEST_TYPE_CONTIG(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
#else
TESTING("contiguous, with type conversion (float->llong)")
@@ -273,7 +273,7 @@ int main(void)
TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned int, H5T_NATIVE_UINT, "uint", transformData, 0);
TEST_TYPE_CHUNK(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1);
TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
-#ifndef H5_LLONG_TO_FP_CAST_BROKEN
+#ifdef H5_LLONG_TO_FP_CAST_WORKS
TEST_TYPE_CHUNK(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
#else
TESTING("chunked, with type conversion (float->llong)")
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 6e2bf6a..f00edb4 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -101,14 +101,14 @@ in the file file_io.win32.c and including it on the projects
#define H5_HAVE_FUNCTION 1
#define H5_ULLONG_TO_FP_CAST_WORKS 1
#if defined __INTEL_COMPILER
-#define H5_LLONG_TO_FP_CAST_BROKEN
+#undef H5_LLONG_TO_FP_CAST_WORKS
#else
-#undef H5_LLONG_TO_FP_CAST_BROKEN
+#define H5_LLONG_TO_FP_CAST_WORKS
#endif
#else
#undef H5_HAVE_FUNCTION
#undef H5_ULLONG_TO_FP_CAST_WORKS
-#undef H5_LLONG_TO_FP_CAST_BROKEN
+#define H5_LLONG_TO_FP_CAST_WORKS
#endif
#define H5_FC_FUNC_(name, NAME) NAME