ftoastr: port to hosts lacking strtof and strtold

Problem reported by Bruno Haible in
<http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00242.html>.
* lib/ftoastr.c (STRTOF): Define to strtod if in a pre-C99
environment and strtold (and presumably strtof) are not available.
* modules/ftoastr (Files): Add m4/c-strtod.m4.
(configure.ac): Require gl_C99_STRTOLD.

diff --git a/ChangeLog b/ChangeLog
index 7f0d11746661194fe1c33de3e718b4571da029a3..a1043bd7032a2bb9e379eb350a6defecfed2de70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       ftoastr: port to hosts lacking strtof and strtold
+       Problem reported by Bruno Haible in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00242.html>.
+       * lib/ftoastr.c (STRTOF): Define to strtod if in a pre-C99
+       environment and strtold (and presumably strtof) are not available.
+       * modules/ftoastr (Files): Add m4/c-strtod.m4.
+       (configure.ac): Require gl_C99_STRTOLD.
+
 2010-11-18  Bruno Haible  <bruno@clisp.org>
 
        c-strtold: Avoid link error on AIX 7.

diff --git a/lib/ftoastr.c b/lib/ftoastr.c
index 25e0705e42d961276e69b4165f958e1b36611bb9..ddc525168abb6867900e1b730d33feb60b799e13 100644 (file)
--- a/lib/ftoastr.c
+++ b/lib/ftoastr.c
@@ -48,6 +48,14 @@
 # define STRTOF strtof
 #endif
 
+/* On pre-C99 hosts, approximate strtof and strtold with strtod.  This
+   may generate one or two extra digits, but that's better than not
+   working at all.  Assume that strtof works if strtold does.  */
+#if LENGTH != 2 && ! HAVE_C99_STRTOLD
+# undef STRTOF
+# define STRTOF strtod
+#endif
+
 int
 FTOASTR (char *buf, size_t bufsize, int flags, int width, FLOAT x)
 {

diff --git a/modules/ftoastr b/modules/ftoastr
index fbc0cba73b9428c6a4685850eee2393e0c6fea0c..64d0a77903ca8af95ed11b509f6ebd79c83f422a 100644 (file)
--- a/modules/ftoastr
+++ b/modules/ftoastr
@@ -6,11 +6,13 @@ lib/ftoastr.h
 lib/ftoastr.c
 lib/dtoastr.c
 lib/ldtoastr.c
+m4/c-strtod.m4
 
 Depends-on:
 intprops
 
 configure.ac:
+AC_REQUIRE([gl_C99_STRTOLD])
 
 Makefile.am:
 lib_SOURCES += ftoastr.h ftoastr.c dtoastr.c ldtoastr.c