61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
|
diff -ru a/Zend/configure.in b/Zend/configure.in
|
||
|
|
--- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000
|
||
|
|
+++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000
|
||
|
|
@@ -70,7 +70,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef zend_isnan
|
||
|
|
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
#define zend_isnan(a) isnan(a)
|
||
|
|
#elif defined(HAVE_FPCLASS)
|
||
|
|
#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
|
||
|
|
@@ -79,7 +79,7 @@
|
||
|
|
#endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
#define zend_isinf(a) isinf(a)
|
||
|
|
#elif defined(INFINITY)
|
||
|
|
/* Might not work, but is required by ISO C99 */
|
||
|
|
@@ -90,7 +90,7 @@
|
||
|
|
#define zend_isinf(a) 0
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
#define zend_finite(a) isfinite(a)
|
||
|
|
#elif defined(HAVE_FINITE)
|
||
|
|
#define zend_finite(a) finite(a)
|
||
|
|
diff -ru a/configure.in b/configure.in
|
||
|
|
--- a/configure.in 2018-11-07 15:35:26.000000000 +0000
|
||
|
|
+++ b/configure.in 2018-11-27 00:28:48.000000000 +0000
|
||
|
|
@@ -75,7 +75,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef zend_isnan
|
||
|
|
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
#define zend_isnan(a) isnan(a)
|
||
|
|
#elif defined(HAVE_FPCLASS)
|
||
|
|
#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
|
||
|
|
@@ -84,7 +84,7 @@
|
||
|
|
#endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
#define zend_isinf(a) isinf(a)
|
||
|
|
#elif defined(INFINITY)
|
||
|
|
/* Might not work, but is required by ISO C99 */
|
||
|
|
@@ -95,7 +95,7 @@
|
||
|
|
#define zend_isinf(a) 0
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
|
||
|
|
#define zend_finite(a) isfinite(a)
|
||
|
|
#elif defined(HAVE_FINITE)
|
||
|
|
#define zend_finite(a) finite(a)
|