diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-01 11:14:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-01 11:14:54 +0200 |
| commit | 8fc58a1a1d32dd288bf4b9e09f9302a99d7b35fe (patch) | |
| tree | ac8467b70f35a493c4362d7dcb1e2b1b87bb3181 /ext/mbstring/mbstring.c | |
| parent | 4a8fe02c7c17d3d4427e9b0097ac72ed6bc163f7 (diff) | |
| parent | 7defd5f69c7360ab1755f8a467972b3b012632c8 (diff) | |
| download | php-git-8fc58a1a1d32dd288bf4b9e09f9302a99d7b35fe.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 4ca947374e..a055fcfdfa 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -425,6 +425,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_chr, 0, 0, 1) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +#if HAVE_MBREGEX ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_encoding, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() @@ -508,6 +509,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_set_options, 0, 0, 0) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +#endif /* HAVE_MBREGEX */ /* }}} */ /* {{{ zend_function_entry mbstring_functions[] */ |