diff options
| author | Anatol Belski <ab@php.net> | 2017-07-04 16:38:12 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-04 16:38:12 +0200 |
| commit | 41ba98f02d6ce4c7572ef2b7856defead7d232ac (patch) | |
| tree | b57300e732f3626971268f29fc003905266cd46a | |
| parent | 396c0f7a76c46159b30da4f4d3c422527a5c7b8b (diff) | |
| parent | a29264eb8c933f8569e62f1d6d6eba524e76ef70 (diff) | |
| download | php-git-41ba98f02d6ce4c7572ef2b7856defead7d232ac.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix datatype
| -rw-r--r-- | ext/standard/var_unserializer.c | 2 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index ac024fdf42..10657514b4 100644 --- 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); diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 2b32e6b977..19ab3c80c9 100644 --- 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); |