Merge branch 'PHP-7.2'

* PHP-7.2:
  Use compatability zend_isnan() instead of POSIX isnan()
This commit is contained in:
Sara Golemon 2017-07-22 21:33:34 -04:00
commit ad698adddf

View File

@ -2174,12 +2174,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;
}