diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-24 21:11:26 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-24 21:11:26 +0800 |
| commit | dc8a53d4baeb2a4c97b367b78b3d47b53fe6ecbb (patch) | |
| tree | 64263c610eb79196c1ddf919f0f8f93586ba45af /Zend/zend_operators.c | |
| parent | 9b730bf4bf700c4eb4a3e145197f0398823f009c (diff) | |
| parent | 666197b8cc889af6ad0dd794405e138ff4fb2c34 (diff) | |
| download | php-git-dc8a53d4baeb2a4c97b367b78b3d47b53fe6ecbb.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index f022909bc3..ef21b47a41 100644 --- a/Zend/zend_operators.c +++ b/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; 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) /* {{{ */ { |