diff options
| author | Remi Collet <remi@php.net> | 2013-02-04 15:27:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-02-04 15:27:07 +0100 |
| commit | 79956330fe17cfd5f60de456497541b21a89bddf (patch) | |
| tree | c097a0d8c97b3fddae4303fe92932e842c2afb21 /Zend/zend_operators.h | |
| parent | c311884e5b7534f1a55c5bf95edb2add3bd04d0b (diff) | |
| parent | 6533094d9e4d0c85044a170d9fad9a3986a68675 (diff) | |
| download | php-git-79956330fe17cfd5f60de456497541b21a89bddf.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64142 (dval to lval different behavior on ppc64)
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 20a5277d5b..b43e8418d4 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; |