diff options
| author | Anatol Belski <ab@php.net> | 2013-11-20 10:12:06 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-11-20 10:12:06 +0100 |
| commit | c694d1df7babdea108c96dde03db81b1e3e26af6 (patch) | |
| tree | 99ab1889b243106b4d248aec7fbcffa73dbbad46 | |
| parent | bf91f101a6a869d3d93647622449f5c40b95b0d1 (diff) | |
| parent | 18b2b2a0bca38cba7d17ac931362249975b79f65 (diff) | |
| download | php-git-c694d1df7babdea108c96dde03db81b1e3e26af6.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
permanently deactivate that place, not on runtime only
| -rw-r--r-- | Zend/zend_operators.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 15ad79e4db..666a3ecd10 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -789,6 +789,7 @@ static zend_always_inline int fast_mul_function(zval *result, zval *op1, zval *o static zend_always_inline int fast_div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { +#if 0 if (EXPECTED(Z_TYPE_P(op1) == IS_LONG) && 0) { if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) { if (UNEXPECTED(Z_LVAL_P(op2) == 0)) { @@ -843,6 +844,7 @@ static zend_always_inline int fast_div_function(zval *result, zval *op1, zval *o return SUCCESS; } } +#endif return div_function(result, op1, op2 TSRMLS_CC); } |