summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-02-05 12:28:47 +0100
committerRemi Collet <remi@php.net>2013-02-05 12:28:47 +0100
commite7ce002c01945438fc3d4e10356f7e3241240deb (patch)
tree92fe35da7e6a365f4438ca63bed9cfc48c3748e1
parent6533094d9e4d0c85044a170d9fad9a3986a68675 (diff)
downloadphp-git-e7ce002c01945438fc3d4e10356f7e3241240deb.tar.gz
revert
-rw-r--r--NEWS3
-rw-r--r--Zend/zend_operators.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 0649d9d732..2aff180fa9 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 93b904f3c9..02a96dd26e 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;