gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / c-strtod.m4

diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index 7f206c7..318487f 100644 (file)
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,6 +1,6 @@
-# c-strtod.m4 serial 9
+# c-strtod.m4 serial 15
 
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,40 +14,36 @@ AC_DEFUN([gl_C99_STRTOLD],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[/* On HP-UX before 11.23, strtold returns a struct instead of
-               long double.  Reject implementations like that, by requiring
-               compatibility with the C99 prototype.  */
-            #include <stdlib.h>
-            static long double (*p) (char const *, char **) = strtold;
-            static long double
-            test (char const *nptr, char **endptr)
-            {
-              long double r;
-              r = strtold (nptr, endptr);
-              return r;
-            }]],
+                long double.  Reject implementations like that, by requiring
+                compatibility with the C99 prototype.  */
+             #include <stdlib.h>
+             static long double (*p) (char const *, char **) = strtold;
+             static long double
+             test (char const *nptr, char **endptr)
+             {
+               long double r;
+               r = strtold (nptr, endptr);
+               return r;
+             }]],
            [[return test ("1.0", NULL) != 1 || p ("1.0", NULL) != 1;]])],
        [gl_cv_func_c99_strtold=yes],
        [gl_cv_func_c99_strtold=no])])
   if test $gl_cv_func_c99_strtold = yes; then
-    AC_DEFINE([HAVE_C99_STRTOLD], 1, [Define to 1 if strtold conforms to C99.])
+    AC_DEFINE([HAVE_C99_STRTOLD], [1], [Define to 1 if strtold conforms to C99.])
   fi
 ])
 
+dnl Prerequisites of lib/c-strtod.c.
 AC_DEFUN([gl_C_STRTOD],
 [
-  AC_LIBOBJ([c-strtod])
-
-  dnl Prerequisites of lib/c-strtod.c.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  :
+  AC_CHECK_FUNCS([strtod_l])
 ])
 
+dnl Prerequisites of lib/c-strtold.c.
 AC_DEFUN([gl_C_STRTOLD],
 [
-  AC_LIBOBJ([c-strtold])
-
-  dnl Prerequisites of lib/c-strtold.c.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_C99_STRTOLD])
-  :
+  AC_CHECK_FUNCS([strtold_l])
 ])