diff options
| author | Nikita Popov <nikic@php.net> | 2015-02-27 23:23:49 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-02-27 23:23:49 +0100 |
| commit | b41b229d78099eaf39f09e9447caeedecf60332c (patch) | |
| tree | c975bdf2c5ec21977ef6b3324012631c019db624 | |
| parent | 4119879a3905cb1b089f475e8a0471717f7049b3 (diff) | |
| parent | e9c679872165fe2a033531670cb9e1682b661ba2 (diff) | |
| download | php-git-b41b229d78099eaf39f09e9447caeedecf60332c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f28d14457a..3e264ed3a7 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1549,12 +1549,14 @@ ZEND_BEGIN_ARG_INFO(arginfo_iptcparse, 0) ZEND_ARG_INFO(0, iptcdata) ZEND_END_ARG_INFO() /* }}} */ + /* {{{ lcg.c */ ZEND_BEGIN_ARG_INFO(arginfo_lcg_value, 0) ZEND_END_ARG_INFO() /* }}} */ + /* {{{ levenshtein.c */ -ZEND_BEGIN_ARG_INFO(arginfo_levenshtein, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_levenshtein, 0, 0, 2) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_ARG_INFO(0, cost_ins) |