Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix datatype

diff --cc ext/standard/var_unserializer.c
index ac024fdf42e108e494f385f56841f34bdb5304c2,f9ebbe0a6a53e64f21876d082c3a9d9bd58b41a6..10657514b41676022a121d3de747cf3dc23c6f7a
--- 1/ext/standard/var_unserializer.c
--- 2/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1402,9 -1363,9 +1402,9 @@@ yy91
        goto yy18;
  yy92:
        ++YYCURSOR;
 -#line 794 "ext/standard/var_unserializer.re"
 +#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);

diff --cc ext/standard/var_unserializer.re
Simple merge