Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Nikita Popov 2015-02-27 23:23:49 +01:00
commit b41b229d78

View file

@ -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)