diff options
author | Xinchen Hui <laruence@gmail.com> | 2015-11-24 13:45:32 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2015-11-24 13:45:32 +0800 |
commit | e637ead6ede47cb57567bb7444b6595500d52d7a (patch) | |
tree | 3518bf2cf42a68da853b2d31f104077405b98048 /ext/standard/basic_functions.c | |
parent | fd545f4f44ff44bba9f75ae3f044dc2ba9c61083 (diff) | |
parent | e6b46dc2ff80e78a537155b6d5a556426c90fb59 (diff) | |
download | php-git-e637ead6ede47cb57567bb7444b6595500d52d7a.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r-- | ext/standard/basic_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 8da45c4287..9462ba3ea4 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -451,8 +451,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_change_key_case, 0, 0, 1) ZEND_ARG_INFO(0, case) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_array_unique, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_array_unique, 0, 0, 1) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ + ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect_key, 0, 0, 2) |