Replace `SF_MAXDOUBLE` with `DBL_MAX` in lib/sfio

There are multiple checks to set SF_MAXDOUBLE, which is then only used
once. Since we are compiling with standard C and `float.h` is part of the
standard C API, we can use DBL_MAX instead and remove the define of
SF_MAXDOUBLE. This also results in some header files that are no longer
included, so checks for these could also be removed.

diff --git a/ast_common.h.in b/ast_common.h.in
index c727782993c643d2fb757e7a1b548f69c49ce47d..ab1b67133c68babe0302ebf0c4fc88197801db35 100644 (file)
--- a/ast_common.h.in
+++ b/ast_common.h.in
@@ -7,18 +7,10 @@
 #  define _sys_types 1
 #endif
 
-#ifdef HAVE_LIMITS_H
-#  define _hdr_limits 1
-#endif
-
 #ifdef HAVE_FLOAT_H
 #  define _hdr_float 1
 #endif
 
-#ifdef HAVE_VALUES_H
-#  define _hdr_values 1
-#endif
-
 #ifdef HAVE_SYS_TYPES_H
 #  define _sys_types 1
 #endif

diff --git a/config.iffe b/config.iffe
index e735e4470d7305fa5c933972ed65ac8d9cea7f89..b053b145386fa13ffb336e1e883691c848978b28 100644 (file)
--- a/config.iffe
+++ b/config.iffe
@@ -30,7 +30,6 @@ hdr ft2build
 hdr getopt
 hdr iconv
 hdr inttypes
-hdr limits
 hdr malloc
 hdr ndir
 hdr netdb
@@ -42,7 +41,6 @@ hdr stdint
 hdr strings
 hdr termios
 hdr unistd
-hdr values
 
 sys types
 sys socket

diff --git a/lib/sfio/features/sfio b/lib/sfio/features/sfio
index 503d67d247529bfc495a8d5b885db61480ee08a7..6df89258a6c747a57501406e01b9058cbd84cdd8 100644 (file)
--- a/lib/sfio/features/sfio
+++ b/lib/sfio/features/sfio
@@ -14,10 +14,7 @@ lib qfrexp
 lib qldexp
 
 hdr unistd
-hdr values
-hdr floatingpoint
 hdr float
-hdr limits
 lib atexit
 lib onexit
 

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index 2abd8f9aafd5df12838262f98159b424e290bbde..2658f1f801be9b699614bec4db5ed1632baee361 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -80,10 +80,7 @@ extern "C" {
 #undef  _hdr_vfork
 #undef  _sys_vfork
 #undef  _lib_vfork
-#undef  _hdr_floatingpoint
 #undef  _hdr_float
-#undef  _hdr_values
-#undef  _hdr_limits
 #undef  _hdr_math
 #undef  _sys_mman
 #undef  _hdr_mman
@@ -229,67 +226,14 @@ extern "C" {
 
 #if _hdr_math
 #include       <math.h>
-#if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
-#define SF_MAXDOUBLE   MAXDOUBLE
-#endif
-#if !defined(SF_MAXDOUBLE) && defined(DBL_MAX)
-#define SF_MAXDOUBLE   DBL_MAX
-#endif
-#endif
-
-#ifdef MAXFLOAT                        /* on some platforms, these are defined in both values.h and math.h */
-#undef MAXFLOAT                        /* we don't need them so we zap them here to avoid compiler warnings */
-#endif
-#ifdef MAXSHORT
-#undef MAXSHORT
-#endif
-#ifdef MAXINT
-#undef MAXINT
-#endif
-#ifdef MAXLONG
-#undef MAXLONG
 #endif
 
-#if _hdr_limits
-#include       <limits.h>
-#else
-#if _hdr_values
-#include       <values.h>
-#if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
-#define SF_MAXDOUBLE   MAXDOUBLE
-#endif
-#if !defined(SF_MAXDOUBLE) && defined(DBL_MAX)
-#define SF_MAXDOUBLE   DBL_MAX
-#endif
-#endif
-#endif
-
-#if !defined(SF_MAXDOUBLE) && defined(_hdr_floatingpoint)
-#include       <floatingpoint.h>
-#if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
-#define SF_MAXDOUBLE   MAXDOUBLE
-#endif
-#if !defined(SF_MAXDOUBLE) && defined(DBL_MAX)
-#define SF_MAXDOUBLE   DBL_MAX
-#endif
-#endif
-
-#if !defined(SF_MAXDOUBLE) && _hdr_float
+#if _hdr_float
 #include       <float.h>
-#if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
-#define SF_MAXDOUBLE   MAXDOUBLE
-#endif
-#if !defined(SF_MAXDOUBLE) && defined(DBL_MAX)
-#define SF_MAXDOUBLE   DBL_MAX
-#endif
 #endif
 
 #if !defined(_ast_fltmax_double)
 
-#if !defined(SF_MAXDOUBLE)
-#define SF_MAXDOUBLE   1.79769313486231570e+308
-#endif
-
 #if defined(_lib_qfrexp) && _lib_qldexp
 #define _has_expfuncs  1
 #define frexp          qfrexp

diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c
index 8ed56ab344f93c38bc550cf729e23de0fec62fa8..ba0a46e467c7bda087d77aacd4d2055b3be1d30c 100644 (file)
--- a/lib/sfio/sfputd.c
+++ b/lib/sfio/sfputd.c
@@ -47,7 +47,7 @@ Sfdouble_t v;
        n = 0;
 
 #if !defined(_ast_fltmax_double)               /* don't know how to do these yet */
-    if (v > SF_MAXDOUBLE && !_has_expfuncs) {
+    if (v > DBL_MAX && !_has_expfuncs) {
        SFOPEN(f, 0);
        SFMTXRETURN(f, -1);
     }

diff --git a/windows/include/FEATURE/sfio b/windows/include/FEATURE/sfio
index d5b535a2d9aaf6142da0e8d1f3726eb4636579b3..49f199a31fb87777e2bd1f4ecb59bbe04d792b76 100644 (file)
--- a/windows/include/FEATURE/sfio
+++ b/windows/include/FEATURE/sfio
@@ -6,9 +6,7 @@
 #define _sys_time      1       /* #include <sys/time.h> ok */
 #define _hdr_math      1       /* #include <math.h> ok */
 //#define _hdr_unistd  1       /* #include <unistd.h> ok */
-#define _hdr_values    1       /* #include <values.h> ok */
 #define _hdr_float     1       /* #include <float.h> ok */
-#define _hdr_limits    1       /* #include <limits.h> ok */
 #define _lib_atexit    1       /* atexit() in default lib(s) */
 #define _lib_ftruncate 0       /* ftruncate() in default lib(s) */
 #define _lib_lseek64   1       /* lseek64() in default lib(s) */