diff options
Diffstat (limited to 'ext/recode')
| -rw-r--r-- | ext/recode/config9.m4 | 7 | ||||
| -rw-r--r-- | ext/recode/recode.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/recode/config9.m4 b/ext/recode/config9.m4 index 66df50e221..2065f6c6e9 100644 --- a/ext/recode/config9.m4 +++ b/ext/recode/config9.m4 @@ -5,12 +5,7 @@ dnl dnl Check for extensions with which Recode can not work if test "$PHP_RECODE" != "no"; then test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" - - if test -n "$MYSQL_LIBNAME"; then - PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [ - recode_conflict="$recode_conflict mysql" - ]) - fi + test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql" if test -n "$recode_conflict"; then AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) diff --git a/ext/recode/recode.c b/ext/recode/recode.c index 51586c89cc..20542038da 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -67,11 +67,13 @@ ZEND_DECLARE_MODULE_GLOBALS(recode); static PHP_GINIT_FUNCTION(recode); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_string, 0, 0, 2) ZEND_ARG_INFO(0, request) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_file, 0, 0, 3) ZEND_ARG_INFO(0, request) ZEND_ARG_INFO(0, input) |