diff options
| author | Anatol Belski <ab@php.net> | 2013-11-20 10:11:39 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-11-20 10:11:39 +0100 |
| commit | 18b2b2a0bca38cba7d17ac931362249975b79f65 (patch) | |
| tree | c8ed1c7c9042d3c3193d4f0b38d8261fb519081d | |
| parent | b8b92bd790d519dcd86d6472f806ab9663d89086 (diff) | |
| parent | b902a25cc319e0e824104245e382376a48256803 (diff) | |
| download | php-git-18b2b2a0bca38cba7d17ac931362249975b79f65.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 6e7c1c01df..6e52de0698 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); } |