Find out whether @<float.h>@ exists (hack for uC-Linux).

diff --git a/configure.in b/configure.in
index 49ebdfc3963870d3c9b2c06a7f29ecde9ff94b12..b49f4945442c94d779ca5c109a7cb77b227722bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
 dnl -*-fundamental-*-
 dnl

-dnl $Id: configure.in,v 1.28 2000/10/08 11:07:55 mdw Exp $
+dnl $Id: configure.in,v 1.29 2001/06/22 19:34:07 mdw Exp $

 dnl
 dnl Configuration script for mLib
 dnl
 dnl
 dnl Configuration script for mLib
 dnl


@@ -29,6 +29,9 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $

+dnl Revision 1.29  2001/06/22 19:34:07  mdw
+dnl Find out whether @<float.h>@ exists (hack for uC-Linux).
+dnl

 dnl Revision 1.28  2000/10/08 11:07:55  mdw
 dnl Define a constant to tell @mdwopt@ that @str_qword@ is available.
 dnl Reinstate the `-pedantic' option to GCC.
 dnl Revision 1.28  2000/10/08 11:07:55  mdw
 dnl Define a constant to tell @mdwopt@ that @str_qword@ is available.
 dnl Reinstate the `-pedantic' option to GCC.


@@ -82,6 +85,8 @@ AC_PROG_CC
 AM_PROG_LIBTOOL
 mdw_GCC_FLAGS
 
 AM_PROG_LIBTOOL
 mdw_GCC_FLAGS
 

+AC_CHECK_HEADERS(float.h)
+

 mdw_CHECK_MANYLIBS(socket, socket)
 mdw_CHECK_MANYLIBS(gethostbyname, nsl resolv)
 
 mdw_CHECK_MANYLIBS(socket, socket)
 mdw_CHECK_MANYLIBS(gethostbyname, nsl resolv)
 

diff --git a/dputf.c b/dputf.c
index 5df210c055f67c35b8e821a9075c28009956ecc3..bb0641ca45182c23b9992858abfc4370e70b59fa 100644 (file)
--- a/dputf.c
+++ b/dputf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: dputf.c,v 1.3 2001/01/20 12:06:01 mdw Exp $
+ * $Id: dputf.c,v 1.4 2001/06/22 19:35:29 mdw Exp $

  *
  * `printf'-style formatting for dynamic strings
  *
  *
  * `printf'-style formatting for dynamic strings
  *


@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dputf.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dputf.c,v $

+ * Revision 1.4  2001/06/22 19:35:29  mdw
+ * Find out whether @<float.h>@ exists (hack for uC-Linux).
+ *

  * Revision 1.3  2001/01/20 12:06:01  mdw
  * Define flags with macros, to ensure unsignedness.
  *
  * Revision 1.3  2001/01/20 12:06:01  mdw
  * Define flags with macros, to ensure unsignedness.
  *


@@ -44,13 +47,16 @@
 /*----- Header files ------------------------------------------------------*/
 
 #include <ctype.h>
 /*----- Header files ------------------------------------------------------*/
 
 #include <ctype.h>

-#include <float.h>

 #include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

+#ifdef HAVE_FLOAT_H
+#  include <float.h>
+#endif
+

 #include "dstr.h"
 
 /*----- Tunable constants -------------------------------------------------*/
 #include "dstr.h"
 
 /*----- Tunable constants -------------------------------------------------*/


@@ -192,6 +198,7 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
          goto formatted;
 
        case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
          goto formatted;
 
        case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':

+#ifdef HAVE_FLOAT_H

          DPUTC(&dd, *p);
          DPUTZ(&dd);
          if (*p == 'f') {
          DPUTC(&dd, *p);
          DPUTZ(&dd);
          if (*p == 'f') {


@@ -213,6 +220,9 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
            d->len += sprintf(d->buf + d->len, dd.buf,
                              va_arg(ap, double));
          goto formatted;
            d->len += sprintf(d->buf + d->len, dd.buf,
                              va_arg(ap, double));
          goto formatted;

+#else
+         DPUTS(d, "<no float support>");
+#endif

 
        case 'c':
          DPUTC(&dd, *p);
 
        case 'c':
          DPUTC(&dd, *p);