diff options
| author | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
|---|---|---|
| committer | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
| commit | a1554ca6343598c38e4fb4fbcc46419ce0bdf058 (patch) | |
| tree | e66e73ff23a340cf7343459a0331a57b8eff65aa /Zend/zend_operators.c | |
| parent | e0d51d1cf00d43c57104764b620bb9219889a86d (diff) | |
| parent | 5b925824edf3edc951fc41608d5cbd07a0baab08 (diff) | |
| download | php-git-a1554ca6343598c38e4fb4fbcc46419ce0bdf058.tar.gz | |
Merge in changes from master
Now also includes "on [TYPE]" in "Call to a member function" error
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) /* {{{ */ { |