Merge remote-tracking branch '64bit_ng/master'

Conflicts:
	Zend/zend_API.h

diff --cc Zend/zend_API.h
index 0268374fc4d83c75e9e6556cf7ae5763b63f939d,180cfbce7e1848b59334cba068c062e75b92f523..ec23dde79648fb20dc784c78fb92a127b50fdca0
--- 1/Zend/zend_API.h
--- 2/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;