diff options
| author | Remi Collet <remi@php.net> | 2018-08-30 09:04:13 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-08-30 09:04:13 +0200 |
| commit | 6e703c957ebd939b8d5f0693b0fd3894e385617e (patch) | |
| tree | 5a09d3f1fb65a7686506f1f9de00a741bfb32d09 | |
| parent | fd5a453cb9976af6f1f9e1a72135c03804f208f6 (diff) | |
| parent | c1729272b17a1fe893d1a54e423d3b71470f3ee8 (diff) | |
| download | php-git-6e703c957ebd939b8d5f0693b0fd3894e385617e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix double cast to int on 32-bit
| -rw-r--r-- | Zend/zend_operators.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 3ee98e13e3..d006b646d1 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -3108,7 +3108,7 @@ ZEND_API zend_long ZEND_FASTCALL zend_dval_to_lval_slow(double d) if (dmod < 0) { /* we're going to make this number positive; call ceil() * to simulate rounding towards 0 of the negative number */ - dmod = ceil(dmod);// + two_pow_32; + dmod = ceil(dmod) + two_pow_32; } return (zend_long)(zend_ulong)dmod; } |