- Fix for Solaris.

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 03cd4e1840673c0817d5cdc7a2c4c87e2a24d5bb..4e7b7f2d871b29b1157fede2078e19ffaa4367a2 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -62,7 +62,7 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite)
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
 AC_ZEND_BROKEN_SPRINTF
 
 AC_CHECK_FUNCS(finite isfinite isinf isnan)

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index d88fefb1b76bacf95e320797d3e6116e5a3f1315..d5cfefee44caa678eb02a824568d44f7406a59a1 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -19,6 +19,10 @@
 # include <sys/types.h>
 #endif
 
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
 #ifdef HAVE_STRING_H
 # include <string.h>
 #else
@@ -37,6 +41,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #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
@@ -46,6 +52,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #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