MFH: Found a NAN/INF solution that should be portable everywhere(?)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index d7c3d48b99d4d715c216bf5d84b2081cca985d14..f308e3925d208371f365cf65420d7859330af265 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1001,12 +1001,14 @@ static void basic_globals_dtor(php_basic_globals *basic_globals_p TSRMLS_DC)
 
 PHPAPI double php_get_nan()
 {
-#if defined(__i386__) || defined(_X86_) || defined(ALPHA) || defined(_ALPHA) || defined(__alpha)
+#if HAVE_HUGE_VAL_NAN
+       return HUGE_VAL + -HUGE_VAL;
+#elif defined(__i386__) || defined(_X86_) || defined(ALPHA) || defined(_ALPHA) || defined(__alpha)
        double val;
        ((php_uint32*)&val)[1] = PHP_DOUBLE_QUIET_NAN_HIGH;
        ((php_uint32*)&val)[0] = 0;
        return val;
-#elif defined(HAVE_ATOF_ACCEPTS_NAN)
+#elif HAVE_ATOF_ACCEPTS_NAN
        return atof("NAN");
 #else
        return 0.0/0.0;
@@ -1015,12 +1017,14 @@ PHPAPI double php_get_nan()
 
 PHPAPI double php_get_inf()
 {
-#if defined(__i386__) || defined(_X86_) || defined(ALPHA) || defined(_ALPHA) || defined(__alpha)
+#if HAVE_HUGE_VAL_NAN
+       return HUGE_VAL;
+#elif defined(__i386__) || defined(_X86_) || defined(ALPHA) || defined(_ALPHA) || defined(__alpha)
        double val;
        ((php_uint32*)&val)[1] = PHP_DOUBLE_INFINITY_HIGH;
        ((php_uint32*)&val)[0] = 0;
        return val;
-#elif defined(HAVE_ATOF_ACCEPTS_INF)
+#elif HAVE_ATOF_ACCEPTS_INF
        return atof("INF");
 #else
        return 1.0/0.0;

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 6d5eccd47de0dfa70664f6892517bfbc13dcda59..43000643c5d06932614ef6ee696ad9d82c10d2af 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -328,6 +328,49 @@ if test "$ac_cv_atof_accept_inf" = "yes"; then
   AC_DEFINE([HAVE_ATOF_ACCEPTS_INF], 1, [whether atof() accepts INF])
 fi
 
+AC_CACHE_CHECK(whether HUGE_VAL + -HUGEVAL = NAN, ac_cv_huge_val_nan,[
+  AC_TRY_RUN([
+#include <math.h>
+#include <stdlib.h>
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(NAN)
+#define zend_isnan(a) (((a)==NAN)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+
+int main(int argc, char** argv)
+{
+       return zend_isinf(HUGE_VAL) && zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
+}
+  ],[
+      ac_cv_huge_val_nan=yes
+  ],[
+      ac_cv_huge_val_nan=no
+  ],[
+      ac_cv_huge_val_nan=yes
+  ])
+])
+dnl This is the most probable fallback so we assume yes in case of cross compile.
+if test "$ac_cv_huge_val_nan" = "yes"; then
+  AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL = NAN])
+fi
+
 PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
                             cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
                             flock_compat.c formatted_print.c fsock.c head.c html.c image.c \

diff --git a/main/config.w32.h b/main/config.w32.h
index 69bf0afceb8f05cc1b0f40dcc79c6e51101780af..74721e59fa897c0384bb0e0ef8c4e6ee3cdc4e79 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -177,3 +177,4 @@
 
 #undef HAVE_ATOF_ACCEPTS_NAN
 #undef HAVE_ATOF_ACCEPTS_INF
+#define HAVE_HUGE_VAL_NAN 1