com php-src: Merge remote-tracking branch '64bit_ng/mas ter': Zend/zend_API.h
| From: | Anatol Belski | Date: | Mon, 18 Aug 2014 08:34:29 +0000 |
| Subject: | com php-src: Merge remote-tracking branch '64bit_ng/mas ter': Zend/zend_API.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80774@lists.php.net to get a copy of this message | ||
Commit: 483a800c988586b155bc262098adf0e88177a133
Author: Anatol Belski <ab@php.net> Mon, 18 Aug 2014 10:34:29 +0200
Parents: 35189d2dd68f9451512c018ed26918652f48a4fd c586133d077fba53290e96b019ff660c8357dd84
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=483a800c988586b155bc262098adf0e88177a133
Log:
Merge remote-tracking branch '64bit_ng/master'
Conflicts:
Zend/zend_API.h
Changed paths:
MM Zend/zend_API.h
Diff:
diff --cc Zend/zend_API.h
index 0268374,180cfbc..ec23dde
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@@ -1077,16 -1077,16 +1077,16 @@@ static zend_always_inline int _z_param_
if (check_null) {
*is_null = 0;
}
- if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
- *dest = Z_LVAL_P(arg);
+ if (EXPECTED(Z_TYPE_P(arg) == IS_INT)) {
++ *dest = Z_IVAL_P(arg);
+ } else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
- if (strict && UNEXPECTED(Z_DVAL_P(arg) > LONG_MAX)) {
- *dest = LONG_MAX;
- } else if (strict && UNEXPECTED(Z_DVAL_P(arg) < LONG_MIN)) {
- *dest = LONG_MIN;
+ if (strict && UNEXPECTED(Z_DVAL_P(arg) > ZEND_INT_MAX)) {
- *dest = ZEND_INT_MAX;
++ *dest = ZEND_INT__MAX;
+ } else if (strict && UNEXPECTED(Z_DVAL_P(arg) < ZEND_INT_MIN)) {
+ *dest = ZEND_INT_MIN;
} else {
- *dest = zend_dval_to_lval(Z_DVAL_P(arg));
- *dest = Z_IVAL_P(arg);
++ *dest = zend_dval_to_ival(Z_DVAL_P(arg));
}
- } else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
- *dest = zend_dval_to_ival(Z_DVAL_P(arg));
} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
double d;
int type;