From: Anatol Belski <ab@php.net>
Date: Tue, 4 Jul 2017 14:38:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.8RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41ba98f02d6ce4c7572ef2b7856defead7d232ac;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix datatype
---

41ba98f02d6ce4c7572ef2b7856defead7d232ac
diff --cc ext/standard/var_unserializer.c
index ac024fdf42,f9ebbe0a6a..10657514b4
--- a/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);