diff options
| author | Remi Collet <remi@php.net> | 2013-02-05 12:29:01 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-02-05 12:29:01 +0100 |
| commit | 7b75a941ef2d3062557e4d5f746e9d6de39b6900 (patch) | |
| tree | 97b9bbc293a9fc1bce0eb672285fb84b96496eff /Zend/zend_operators.h | |
| parent | 6585a7bd7904fac22640eb38a7eab53fe8efc19a (diff) | |
| parent | e7ce002c01945438fc3d4e10356f7e3241240deb (diff) | |
| download | php-git-7b75a941ef2d3062557e4d5f746e9d6de39b6900.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
revert
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index b43e8418d4..20a5277d5b 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -79,7 +79,7 @@ static zend_always_inline long zend_dval_to_lval(double d) #else static zend_always_inline long zend_dval_to_lval(double d) { - if (d >= LONG_MAX) { + if (d > LONG_MAX) { return (long)(unsigned long) d; } return (long) d; |