com php-src: revert: NEWS Zend/zend_operators.h
| From: | Remi Collet | Date: | Tue, 05 Feb 2013 11:28:47 +0000 |
| Subject: | com php-src: revert: NEWS Zend/zend_operators.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71173@lists.php.net to get a copy of this message | ||
Commit: e7ce002c01945438fc3d4e10356f7e3241240deb
Author: Remi Collet <remi@php.net> Tue, 5 Feb 2013 12:28:47 +0100
Parents: 6533094d9e4d0c85044a170d9fad9a3986a68675
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7ce002c01945438fc3d4e10356f7e3241240deb
Log:
revert
Changed paths:
M NEWS
M Zend/zend_operators.h
Diff:
diff --git a/NEWS b/NEWS
index 0649d9d..2aff180 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,6 @@ PHP NEWS
- CLI server:
. Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)
-- Core:
- . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
-
?? ??? 2012, PHP 5.4.12
- Core:
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 93b904f..02a96dd 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;