Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: fix datatype
9 years ago · 41ba98f02d
2 changed files with 2 additions and 2 deletions
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@ -1404,7 +1404,7 @@ yy92:
 	++YYCURSOR;
 #line 833 "ext/standard/var_unserializer.re"
 	{
-	long elements;
+	zend_long elements;
    if (!var_hash) return 0;

 	elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@ -831,7 +831,7 @@ use_double:
 }

 "o:" iv ":" ["] {
-	long elements;
+	zend_long elements;
    if (!var_hash) return 0;

 	elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);