Browse Source

Merge branch 'PHP-5.6'

pull/666/merge
Xinchen Hui 12 years ago
parent
commit
dc8a53d4ba
  1. 3
      Zend/zend_operators.c

3
Zend/zend_operators.c

@ -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; zval op1_copy, op2_copy;
int converted = 0; 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) /* {{{ */ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{ {

Loading…
Cancel
Save