c-strtold: Avoid link error on AIX 7.

* lib/c-strtod.c: Test also HAVE_STRTOD_L or HAVE_STRTOLD_L.
* m4/c-strtod.m4 (gl_C_STRTOD): Test whether strtod_l exists.
(gl_C_STRTOLD): Test whether strtold_l exists.
Reported by Albert Chin <bug-gnulib@mlists.thewrittenword.com>.

diff --git a/ChangeLog b/ChangeLog
index 0ab0af34bf441c60a489de1d62c39134efb5e25a..7f0d11746661194fe1c33de3e718b4571da029a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-18  Bruno Haible  <bruno@clisp.org>
+
+       c-strtold: Avoid link error on AIX 7.
+       * lib/c-strtod.c: Test also HAVE_STRTOD_L or HAVE_STRTOLD_L.
+       * m4/c-strtod.m4 (gl_C_STRTOD): Test whether strtod_l exists.
+       (gl_C_STRTOLD): Test whether strtold_l exists.
+       Reported by Albert Chin <bug-gnulib@mlists.thewrittenword.com>.
+
 2010-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        intprops: new macro INT_BITS_STRLEN_BOUND

diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 38d472bd2501e8d4e46f62e7038b084564bc15e7..8bc7f15605992c0d28704a86d16e6cb4b5ea760d 100644 (file)
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -43,7 +43,7 @@
 # define STRTOD strtod
 #endif
 
-#ifdef LC_ALL_MASK
+#if defined LC_ALL_MASK && (LONG ? HAVE_STRTOLD_L : HAVE_STRTOD_L)
 
 /* Cache for the C locale object.
    Marked volatile so that different threads see the same value
@@ -67,7 +67,7 @@ C_STRTOD (char const *nptr, char **endptr)
 {
   DOUBLE r;
 
-#ifdef LC_ALL_MASK
+#if defined LC_ALL_MASK && (LONG ? HAVE_STRTOLD_L : HAVE_STRTOD_L)
 
   locale_t locale = c_locale ();
   if (!locale)

diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index 41cf18e980fe2f53d2be49508413613ba473997e..0f367f6a74c543df7d09e7c79a6d4117569617ab 100644 (file)
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,4 +1,4 @@
-# c-strtod.m4 serial 11
+# c-strtod.m4 serial 12
 
 # Copyright (C) 2004-2006, 2009-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -39,6 +39,7 @@ AC_DEFUN([gl_C_STRTOD],
 
   dnl Prerequisites of lib/c-strtod.c.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_FUNCS([strtod_l])
 
   AC_REQUIRE([AC_C_INLINE])
   :
@@ -51,6 +52,7 @@ AC_DEFUN([gl_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])
 
   AC_REQUIRE([AC_C_INLINE])
   :