Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Use compatability zend_isnan() instead of POSIX isnan()
fabpot · Jul 23, 2017 · a4e3589 · a4e3589
2 parents 1229b0f + 775b4b5
commit a4e3589
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -2166,12 +2166,12 @@ ZEND_API int ZEND_FASTCALL is_not_equal_function(zval *result, zval *op1, zval *
 
 ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op2) /* {{{ */
 {
-	if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && isnan(Z_DVAL_P(op1)))) {
+	if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op1)))) {
 		ZVAL_FALSE(result);
 		return SUCCESS;
 	}
 
-	if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && isnan(Z_DVAL_P(op2)))) {
+	if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op2)))) {
 		ZVAL_FALSE(result);
 		return SUCCESS;
 	}