X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtod.m4;h=6b2d73176bf3a7d8b02607aed385588301f3d17b;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=512746663afea0356a6cdb0fa852dbcec39c70d8;hpb=7c466f0ea2edfa1ffa0b509fd8cc2287414b0dab;p=gnulib.git

diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 512746663..6b2d73176 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -1,6 +1,5 @@
-# strtod.m4 serial 8
-dnl Copyright (C) 2002, 2003, 2006, 2007, 2008 Free Software
-dnl Foundation, Inc.
+# strtod.m4 serial 13
+dnl Copyright (C) 2002-2003, 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +8,7 @@ AC_DEFUN([gl_FUNC_STRTOD],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_FUNC_STRTOD
-  dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ(strtod).
+  dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ([strtod]).
   if test $ac_cv_func_strtod = no; then
     HAVE_STRTOD=0
     REPLACE_STRTOD=1
@@ -19,13 +18,23 @@ AC_DEFUN([gl_FUNC_STRTOD],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <stdlib.h>
 #include <math.h>
+#include <errno.h>
+/* Compare two numbers with ==.
+   This is a separate function because IRIX 6.5 "cc -O" miscompiles an
+   'x == x' test.  */
+static int
+numeric_equal (double x, double y)
+{
+  return x == y;
+}
 ]], [[
   {
     /* Older glibc and Cygwin mis-parse "-0x".  */
     const char *string = "-0x";
     char *term;
     double value = strtod (string, &term);
-    if (1 / value != -HUGE_VAL || term != (string + 2))
+    double zero = 0.0;
+    if (1.0 / value != -1.0 / zero || term != (string + 2))
       return 1;
   }
   {
@@ -37,17 +46,36 @@ AC_DEFUN([gl_FUNC_STRTOD],
       return 1;
   }
   {
-    /* Many platforms do not parse infinities.  */
+    /* Many platforms do not parse infinities.  HP-UX 11.31 parses inf,
+       but mistakenly sets errno.  */
     const char *string = "inf";
     char *term;
+    double value;
+    errno = 0;
+    value = strtod (string, &term);
+    if (value != HUGE_VAL || term != (string + 3) || errno)
+      return 1;
+  }
+  {
+    /* glibc 2.7 and cygwin 1.5.24 misparse "nan()".  */
+    const char *string = "nan()";
+    char *term;
+    double value = strtod (string, &term);
+    if (numeric_equal (value, value) || term != (string + 5))
+      return 1;
+  }
+  {
+    /* darwin 10.6.1 misparses "nan(".  */
+    const char *string = "nan(";
+    char *term;
     double value = strtod (string, &term);
-    if (value != HUGE_VAL || term != (string + 3))
+    if (numeric_equal (value, value) || term != (string + 3))
       return 1;
   }
 ]])],
-	[gl_cv_func_strtod_works=yes],
-	[gl_cv_func_strtod_works=no],
-	[gl_cv_func_strtod_works="guessing no"])])
+        [gl_cv_func_strtod_works=yes],
+        [gl_cv_func_strtod_works=no],
+        [gl_cv_func_strtod_works="guessing no"])])
     if test "$gl_cv_func_strtod_works" != yes; then
       REPLACE_STRTOD=1
       gl_PREREQ_STRTOD