mirror of
https://github.com/php/php-src.git
synced 2026-03-29 11:42:17 +02:00
Merge branch 'PHP-5.6'
This commit is contained in:
@@ -963,7 +963,7 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
|
||||
ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
zval op1_copy, op2_copy;
|
||||
int converted = 0;
|
||||
@@ -1045,6 +1045,7 @@ ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
|
||||
}
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user