X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-strtod.c;h=d99e5fe5ec9abe690a7397e586d23f69132dbd7e;hb=4316d00d707d97f660fd0432035780fc0d3f23eb;hp=f412b1ba661b18cd81d3cca7cb7a4bc1505eb6d4;hpb=69ac5f0f948abe2b050248af397db49bd3cff185;p=gnulib.git

diff --git a/tests/test-strtod.c b/tests/test-strtod.c
index f412b1ba6..d99e5fe5e 100644
--- a/tests/test-strtod.c
+++ b/tests/test-strtod.c
@@ -25,97 +25,115 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "isnand-nolibm.h"
+
 #define ASSERT(expr) \
   do									     \
     {									     \
       if (!(expr))							     \
 	{								     \
 	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+	  fflush (stderr);						     \
 	  /* FIXME abort ();*/status = 1;                               \
 	}								     \
     }									     \
   while (0)
 
+/* Avoid requiring -lm just for fabs.  */
+#define FABS(d) ((d) < 0.0 ? -(d) : (d))
+
+/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
+   So we use -zero instead.  */
+double zero = 0.0;
+
 int
 main ()
 {
   int status = 0;
   /* Subject sequence empty or invalid.  */
   {
-    errno = 0;
     const char input[] = "";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " ";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " +";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " .";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " .e0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);              /* IRIX 6.5, OSF/1 5.1 */
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " +.e-0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);              /* IRIX 6.5, OSF/1 5.1 */
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " in";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);
     ASSERT (errno == 0 || errno == EINVAL);
   }
   {
-    errno = 0;
     const char input[] = " na";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input);
@@ -124,317 +142,356 @@ main ()
 
   /* Simple floating point values.  */
   {
-    errno = 0;
     const char input[] = "1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1.";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = ".5";
     char *ptr;
-    double result = strtod (input, &ptr);
-    ASSERT (result == 0.5);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
+    /* FIXME - gnulib's version is rather inaccurate.  It would be
+       nice to guarantee an exact result, but for now, we settle for a
+       1-ulp error.  */
+    ASSERT (FABS (result - 0.5) < DBL_EPSILON);
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = " 1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "+1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "-1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == -1.0);
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 3);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e+0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 4);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e-0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 4);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 10.0);
     ASSERT (ptr == input + 3);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "5e-1";
     char *ptr;
-    double result = strtod (input, &ptr);
-    ASSERT (result == 0.5);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
+    /* FIXME - gnulib's version is rather inaccurate.  It would be
+       nice to guarantee an exact result, but for now, we settle for a
+       1-ulp error.  */
+    ASSERT (FABS (result - 0.5) < DBL_EPSILON);
     ASSERT (ptr == input + 4);
     ASSERT (errno == 0);
   }
 
   /* Zero.  */
   {
-    errno = 0;
     const char input[] = "0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = ".0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0e0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 3);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0e+9999999";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 10);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0e-9999999";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 10);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "-0";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
-    ASSERT (!!signbit (result) == !!signbit (-0.0)); /* IRIX 6.5 */
+    ASSERT (!!signbit (result) == !!signbit (-zero)); /* IRIX 6.5, OSF/1 4.0 */
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
 
   /* Suffixes.  */
   {
-    errno = 0;
     const char input[] = "1f";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1.f";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e+";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1e-";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1E 2";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);             /* HP-UX 11.11, IRIX 6.5, OSF/1 4.0 */
     ASSERT (ptr == input + 1);          /* HP-UX 11.11, IRIX 6.5 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "00x1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 2);
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "-0x";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
-    ASSERT (!!signbit (result) == !!signbit (-0.0)); /* MacOS X 10.3, FreeBSD 6.2, IRIX 6.5 */
+    ASSERT (!!signbit (result) == !!signbit (-zero)); /* MacOS X 10.3, FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */
     ASSERT (ptr == input + 2);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0xg";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0xp";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x.";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0xp+";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0xp+1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x.p+1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 0.0);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 1);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2 */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "1p+1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);
     ASSERT (ptr == input + 1);
     ASSERT (errno == 0);
@@ -442,45 +499,49 @@ main ()
 
   /* Overflow/underflow.  */
   {
-    errno = 0;
     const char input[] = "1E1000000";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);
-    ASSERT (ptr == input + 9);
+    ASSERT (ptr == input + 9);          /* OSF/1 5.1 */
     ASSERT (errno == ERANGE);
   }
   {
-    errno = 0;
     const char input[] = "-1E1000000";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == -HUGE_VAL);
     ASSERT (ptr == input + 10);
     ASSERT (errno == ERANGE);
   }
   {
-    errno = 0;
     const char input[] = "1E-100000";
     char *ptr;
-    double result = strtod (input, &ptr);
-    ASSERT (0.0 <= result && result <= FLT_MIN);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
+    ASSERT (0.0 <= result && result <= DBL_MIN);
     ASSERT (!signbit (result));
     ASSERT (ptr == input + 9);
     ASSERT (errno == ERANGE);
   }
   {
-    errno = 0;
     const char input[] = "-1E-100000";
     char *ptr;
-    double result = strtod (input, &ptr);
-    ASSERT (-FLT_MIN <= result && result <= 0.0);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
+    ASSERT (-DBL_MIN <= result && result <= 0.0);
 #if 0
     /* FIXME - this is glibc bug 5995; POSIX allows returning positive
        0 on negative underflow, even though quality of implementation
        demands preserving the sign.  Disable this test until fixed
        glibc is more prevalent.  */
-    ASSERT (!!signbit (result) == !!signbit (-0.0)); /* glibc-2.3.6, mingw */
+    ASSERT (!!signbit (result) == !!signbit (-zero)); /* glibc-2.3.6, mingw */
 #endif
     ASSERT (ptr == input + 10);
     ASSERT (errno == ERANGE);
@@ -488,46 +549,51 @@ main ()
 
   /* Infinity.  */
   {
-    errno = 0;
     const char input[] = "iNf";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw */
     ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
   }
   {
-    errno = 0;
     const char input[] = "-InF";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == -HUGE_VAL);       /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (ptr == input + 4);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 4.0, Solaris 9, mingw */
     ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
   }
   {
-    errno = 0;
     const char input[] = "infinite";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (ptr == input + 3);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (errno == 0);                /* OSF/1 4.0 */
   }
   {
-    errno = 0;
     const char input[] = "infinitY";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.00, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw */
     ASSERT (errno == 0);                /* HP-UX 11.11, OSF/1 4.0 */
   }
   {
-    errno = 0;
     const char input[] = "infinitY.";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == HUGE_VAL);        /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (ptr == input + 8);          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (errno == 0);                /* OSF/1 4.0 */
@@ -536,15 +602,17 @@ main ()
   /* NaN.  Some processors set the sign bit of the default NaN, so all
      we check is that using a sign changes the result.  */
   {
-    errno = 0;
     const char input[] = "-nan";
     char *ptr1;
     char *ptr2;
-    double result1 = strtod (input, &ptr1);
-    double result2 = strtod (input + 1, &ptr2);
-#ifdef NAN
-    ASSERT (isnan (result1));           /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnan (result2));           /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+    double result1;
+    double result2;
+    errno = 0;
+    result1 = strtod (input, &ptr1);
+    result2 = strtod (input + 1, &ptr2);
+#if 1 /* All known CPUs support NaNs.  */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
@@ -564,15 +632,17 @@ main ()
 #endif
   }
   {
-    errno = 0;
     const char input[] = "+nan(";
     char *ptr1;
     char *ptr2;
-    double result1 = strtod (input, &ptr1);
-    double result2 = strtod (input + 1, &ptr2);
-#ifdef NAN
-    ASSERT (isnan (result1));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnan (result2));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    double result1;
+    double result2;
+    errno = 0;
+    result1 = strtod (input, &ptr1);
+    result2 = strtod (input + 1, &ptr2);
+#if 1 /* All known CPUs support NaNs.  */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (!!signbit (result1) == !!signbit (result2));
     ASSERT (ptr1 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
     ASSERT (ptr2 == input + 4);         /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 2.5.1, mingw */
@@ -588,15 +658,17 @@ main ()
 #endif
   }
   {
-    errno = 0;
     const char input[] = "-nan()";
     char *ptr1;
     char *ptr2;
-    double result1 = strtod (input, &ptr1);
-    double result2 = strtod (input + 1, &ptr2);
-#ifdef NAN
-    ASSERT (isnan (result1));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnan (result2));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    double result1;
+    double result2;
+    errno = 0;
+    result1 = strtod (input, &ptr1);
+    result2 = strtod (input + 1, &ptr2);
+#if 1 /* All known CPUs support NaNs.  */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
@@ -616,12 +688,13 @@ main ()
 #endif
   }
   {
-    errno = 0;
     const char input[] = " nan().";
     char *ptr;
-    double result = strtod (input, &ptr);
-#ifdef NAN
-    ASSERT (isnan (result));            /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
+#if 1 /* All known CPUs support NaNs.  */
+    ASSERT (isnand (result));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (ptr == input + 6);          /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
     ASSERT (errno == 0);
 #else
@@ -632,18 +705,20 @@ main ()
 #endif
   }
   {
-    errno = 0;
     /* The behavior of nan(0) is implementation-defined, but all
        implementations we know of which handle optional
        n-char-sequences handle nan(0) the same as nan().  */
     const char input[] = "-nan(0).";
     char *ptr1;
     char *ptr2;
-    double result1 = strtod (input, &ptr1);
-    double result2 = strtod (input + 1, &ptr2);
-#ifdef NAN
-    ASSERT (isnan (result1));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-    ASSERT (isnan (result2));           /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    double result1;
+    double result2;
+    errno = 0;
+    result1 = strtod (input, &ptr1);
+    result2 = strtod (input + 1, &ptr2);
+#if 1 /* All known CPUs support NaNs.  */
+    ASSERT (isnand (result1));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+    ASSERT (isnand (result2));          /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
 # if 0
     /* Sign bits of NaN is a portability sticking point, not worth
        worrying about.  */
@@ -665,55 +740,61 @@ main ()
 
   /* Hex.  */
   {
-    errno = 0;
     const char input[] = "0xa";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 10.0);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0XA";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 10.0);            /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x1p";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x1p+";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 1.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (ptr == input + 3);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x1p+1";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (errno == 0);
   }
   {
-    errno = 0;
     const char input[] = "0x1p+1a";
     char *ptr;
-    double result = strtod (input, &ptr);
+    double result;
+    errno = 0;
+    result = strtod (input, &ptr);
     ASSERT (result == 2.0);             /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (ptr == input + 6);          /* NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw */
     ASSERT (errno == 0);
@@ -721,7 +802,6 @@ main ()
 
   /* Large buffers.  */
   {
-    errno = 0;
     size_t m = 1000000;
     char *input = malloc (m + 1);
     if (input)
@@ -731,6 +811,7 @@ main ()
 	memset (input, '\t', m - 1);
 	input[m - 1] = '1';
 	input[m] = '\0';
+	errno = 0;
 	result = strtod (input, &ptr);
 	ASSERT (result == 1.0);
 	ASSERT (ptr == input + m);
@@ -739,7 +820,6 @@ main ()
     free (input);
   }
   {
-    errno = 0;
     size_t m = 1000000;
     char *input = malloc (m + 1);
     if (input)
@@ -749,6 +829,7 @@ main ()
 	memset (input, '0', m - 1);
 	input[m - 1] = '1';
 	input[m] = '\0';
+	errno = 0;
 	result = strtod (input, &ptr);
 	ASSERT (result == 1.0);
 	ASSERT (ptr == input + m);
@@ -760,7 +841,6 @@ main ()
   /* Newlib has an artificial limit of 20000 for the exponent.  TODO -
      gnulib should fix this.  */
   {
-    errno = 0;
     size_t m = 1000000;
     char *input = malloc (m + 1);
     if (input)
@@ -779,6 +859,7 @@ main ()
 	input[m - 2] = '9';
 	input[m - 1] = '1';
 	input[m] = '\0';
+	errno = 0;
 	result = strtod (input, &ptr);
 	ASSERT (result == 1.0);         /* MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
 	ASSERT (ptr == input + m);      /* OSF/1 5.1 */
@@ -787,7 +868,6 @@ main ()
     free (input);
   }
   {
-    errno = 0;
     size_t m = 1000000;
     char *input = malloc (m + 1);
     if (input)
@@ -805,6 +885,7 @@ main ()
 	input[m - 2] = '9';
 	input[m - 1] = '1';
 	input[m] = '\0';
+	errno = 0;
 	result = strtod (input, &ptr);
 	ASSERT (result == 1.0);         /* MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
 	ASSERT (ptr == input + m);
@@ -814,7 +895,6 @@ main ()
   }
 #endif
   {
-    errno = 0;
     size_t m = 1000000;
     char *input = malloc (m + 1);
     if (input)
@@ -827,9 +907,10 @@ main ()
 	input[3] = '1';
 	memset (input + 4, '0', m - 3);
 	input[m] = '\0';
+	errno = 0;
 	result = strtod (input, &ptr);
 	ASSERT (result == 0.0);
-	ASSERT (!!signbit (result) == !!signbit (-0.0)); /* IRIX 6.5 */
+	ASSERT (!!signbit (result) == !!signbit (-zero)); /* IRIX 6.5, OSF/1 4.0 */
 	ASSERT (ptr == input + m);
 	ASSERT (errno == 0);
       }
@@ -839,7 +920,7 @@ main ()
   /* Rounding.  */
   /* TODO - is it worth some tests of rounding for typical IEEE corner
      cases, such as .5 ULP rounding up to the smallest denormal and
-     not causing underflow, or FLT_MIN - .5 ULP not causing an
+     not causing underflow, or DBL_MIN - .5 ULP not causing an
      infinite loop?  */
 
   return status;