1diff -ru a/Zend/configure.in b/Zend/configure.in
2--- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000
3+++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000
4@@ -70,7 +70,7 @@
5 #endif
6
7 #ifndef zend_isnan
8-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
9+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
10 #define zend_isnan(a) isnan(a)
11 #elif defined(HAVE_FPCLASS)
12 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
13@@ -79,7 +79,7 @@
14 #endif
15 #endif
16
17-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
18+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
19 #define zend_isinf(a) isinf(a)
20 #elif defined(INFINITY)
21 /* Might not work, but is required by ISO C99 */
22@@ -90,7 +90,7 @@
23 #define zend_isinf(a) 0
24 #endif
25
26-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
27+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
28 #define zend_finite(a) isfinite(a)
29 #elif defined(HAVE_FINITE)
30 #define zend_finite(a) finite(a)
31diff -ru a/configure.in b/configure.in
32--- a/configure.in 2018-11-07 15:35:26.000000000 +0000
33+++ b/configure.in 2018-11-27 00:28:48.000000000 +0000
34@@ -75,7 +75,7 @@
35 #endif
36
37 #ifndef zend_isnan
38-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
39+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
40 #define zend_isnan(a) isnan(a)
41 #elif defined(HAVE_FPCLASS)
42 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
43@@ -84,7 +84,7 @@
44 #endif
45 #endif
46
47-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
48+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
49 #define zend_isinf(a) isinf(a)
50 #elif defined(INFINITY)
51 /* Might not work, but is required by ISO C99 */
52@@ -95,7 +95,7 @@
53 #define zend_isinf(a) 0
54 #endif
55
56-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
57+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
58 #define zend_finite(a) isfinite(a)
59 #elif defined(HAVE_FINITE)
60 #define zend_finite(a) finite(a)