[svn-r27743] Merge of r26625 from the trunk

Remove the LLONG_TO_LDOUBLE_CORRECT macro/define, it's working around
bugs in very old SGI/FreeBSD/Windows compilers.

Tested on: jam (minor change that has baked in the trunk for months)

3 files changed, 0 insertions, 55 deletions

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 1c514eb..2f3d4d4 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -220,14 +220,6 @@ H5ConversionTests (H5_LDOUBLE_TO_LONG_SPECIAL  "Checking IF your system converts
 #
 H5ConversionTests (H5_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can convert (unsigned) long to long double values with special algorithm")
 # ----------------------------------------------------------------------
-# Set the flag to indicate that the machine can accurately convert
-# '(unsigned) long long' to 'long double' values.  (This flag should be set for
-# all machines, except for Mac OS 10.4, when the bit sequences are 003fff...,
-# 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice
-# as big as they should be.
-#
-H5ConversionTests (H5_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values")
-# ----------------------------------------------------------------------
 # Set the flag to indicate that the machine generates bad code
 # for the H5VM_log2_gen() routine in src/H5VMprivate.h
 # (This flag should be set to no for all machines, except for SGI IRIX64,
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c
index beba01d..cd2e8bb 100644
--- a/config/cmake/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
@@ -116,49 +116,6 @@ done:
 
 #endif
 
-#ifdef H5_LLONG_TO_LDOUBLE_CORRECT_TEST
-int main(void)
-{
-    long double         ld;
-    long long           ll;
-    unsigned long long  ull;
-    unsigned char       s[16];
-    int                 flag=0, ret=0;
-
-    /*Determine if long double has 16 byte in size, 11 bit exponent, and
-     *the bias is 0x3ff */
-    if(sizeof(long double) == 16) {
-        ld = 1.0L;
-        memcpy(s, &ld, 16);
-        if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-            s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
-            flag = 1;
-    }
-
-    if(flag==1 && sizeof(long long)==8) {
-        ll = 0x01ffffffffffffffLL;
-        ld = (long double)ll;
-        memcpy(s, &ld, 16);
-        /*Check if the bit sequence is as supposed to be*/
-        if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
-            s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
-            s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
-            ret = 1;
-    }
-    if(flag==1 && sizeof(unsigned long long)==8) {
-        ull = 0x01ffffffffffffffULL;
-        ld = (long double)ull;
-        memcpy(s, &ld, 16);
-        if(s[0]!=0x43 || s[1]!=0x7f || s[2]!=0xff || s[3]!=0xff ||
-            s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
-            s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
-            ret = 1;
-    }
-done:
-    exit(ret);
-}
-#endif
-
 #ifdef H5_NO_ALIGNMENT_RESTRICTIONS_TEST
 
 #include <stdlib.h>
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 3bdf81e..4084adf 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -369,10 +369,6 @@
    special algorithm. */
 #cmakedefine H5_LDOUBLE_TO_LONG_SPECIAL @H5_LDOUBLE_TO_LONG_SPECIAL@
 
-/* Define if your system can convert (unsigned) long long to long double
-   values correctly. */
-#cmakedefine H5_LLONG_TO_LDOUBLE_CORRECT @H5_LLONG_TO_LDOUBLE_CORRECT@
-
 /* Define if your system can convert (unsigned) long to long double values
    with special algorithm. */
 #cmakedefine H5_LONG_TO_LDOUBLE_SPECIAL @H5_LONG_TO_LDOUBLE_SPECIAL@