diff options
| author | Remi Collet <remi@php.net> | 2013-02-11 09:13:27 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-02-11 09:13:27 +0100 |
| commit | dc47ec049007d97a4d854e5867f04d854a2551ec (patch) | |
| tree | c24dafe1d40c727bbdc899b137a531466056b8b7 /Zend/zend_operators.h | |
| parent | ce005c0883f64c97cd83bdd8a80db3bed7cfcb50 (diff) | |
| parent | e67a2b9e471a7bc0b774b9056bb38745b7187969 (diff) | |
| download | php-git-dc47ec049007d97a4d854e5867f04d854a2551ec.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 20a5277d5b..e395fd39cc 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -79,7 +79,8 @@ 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) { + /* >= as (double)LONG_MAX is outside signed range */ + if (d >= LONG_MAX) { return (long)(unsigned long) d; } return (long) d; |