From: Anatol Belski <ab@php.net>
Date: Mon, 18 Aug 2014 08:34:29 +0000 (+0200)
Subject: Merge remote-tracking branch '64bit_ng/master'
X-Git-Tag: POST_64BIT_BRANCH_MERGE^2~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=483a800c988586b155bc262098adf0e88177a133;p=php

Merge remote-tracking branch '64bit_ng/master'

Conflicts:
	Zend/zend_API.h
---

483a800c988586b155bc262098adf0e88177a133
diff --cc Zend/zend_API.h
index 0268374fc4,180cfbce7e..ec23dde796
--- 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;