com php-src: fix merge mistake: ext/standard/math.c
| From: | Anatol Belski | Date: | Wed, 23 Dec 2015 17:30:32 +0000 |
| Subject: | com php-src: fix merge mistake: ext/standard/math.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90429@lists.php.net to get a copy of this message | ||
Commit: 0ece97e5a446c7eb6610751fb5ffa0e8d42d6d28
Author: Anatol Belski <ab@php.net> Wed, 23 Dec 2015 18:30:32 +0100
Parents: 204faa5c3674e017c34aac23d2059fec8d9f0c38
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0ece97e5a446c7eb6610751fb5ffa0e8d42d6d28
Log:
fix merge mistake
Changed paths:
M ext/standard/math.c
Diff:
diff --git a/ext/standard/math..c b/ext/standard/math.c
index 6203626..73face4 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -390,7 +390,7 @@ PHP_FUNCTION(round)
}
if (ZEND_NUM_ARGS() >= 2) {
-#if SIZEOF_LONG > SIZEOF_INT
+#if SIZEOF_ZEND_LONG > SIZEOF_INT
if (precision >= 0) {
places = precision > INT_MAX ? INT_MAX : (int)precision;
} else {