summaryrefslogtreecommitdiff
path: root/ext/mbstring/mbstring.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-09-26 09:57:54 -0700
committerChristopher Jones <sixd@php.net>2013-09-26 09:57:54 -0700
commiteb8e63bd3cfdbd6ad537dbea5f001c0a1995a40d (patch)
tree1317a8a47c0e4bd1193c8fbf705d91ae75140f78 /ext/mbstring/mbstring.c
parentc02ff01548bb27cb82f46975869b859c4cf98e4b (diff)
parent0d7a6388663b76ebed6585ac92dfca5ef65fa7af (diff)
downloadphp-git-eb8e63bd3cfdbd6ad537dbea5f001c0a1995a40d.tar.gz
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: Implement variadic function syntax
Diffstat (limited to 'ext/mbstring/mbstring.c')
-rw-r--r--ext/mbstring/mbstring.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 4e430b6ea2..168b133c64 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -402,10 +402,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_kana, 0, 0, 1)
ZEND_ARG_INFO(0, encoding)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_variables, 1, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_variables, 0, 0, 3)
ZEND_ARG_INFO(0, to)
ZEND_ARG_INFO(0, from)
- ZEND_ARG_INFO(1, ...)
+ ZEND_ARG_VARIADIC_INFO(1, vars)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_numericentity, 0, 0, 2)