diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-11 15:00:52 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-11 15:00:52 +0100 |
| commit | 779b9bfe0278fdff2613c4d472c99dcefabd1312 (patch) | |
| tree | 567f1da734cb19603484174d73e5ce7431fba4ca /ext/mbstring/mbstring.c | |
| parent | b51a99ae358b3295de272bb3c3edb6913eeb0fd4 (diff) | |
| parent | a6c535e658b9c763186ec7a91007f2dd7469820e (diff) | |
| download | php-git-779b9bfe0278fdff2613c4d472c99dcefabd1312.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 05892cb197..448239cee7 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -56,18 +56,15 @@ #include "mb_gpc.h" #if HAVE_MBREGEX -#include "php_mbregex.h" +# include "php_mbregex.h" +# include "php_onig_compat.h" +# include <oniguruma.h> +# undef UChar +#elif HAVE_PCRE || HAVE_BUNDLED_PCRE +# include "ext/pcre/php_pcre.h" #endif #include "zend_multibyte.h" - -#if HAVE_ONIG -#include "php_onig_compat.h" -#include <oniguruma.h> -#undef UChar -#elif HAVE_PCRE || HAVE_BUNDLED_PCRE -#include "ext/pcre/php_pcre.h" -#endif /* }}} */ #if HAVE_MBSTRING @@ -983,7 +980,7 @@ static void *_php_mb_compile_regex(const char *pattern); static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len); static void _php_mb_free_regex(void *opaque); -#if HAVE_ONIG +#if HAVE_MBREGEX /* {{{ _php_mb_compile_regex */ static void *_php_mb_compile_regex(const char *pattern) { @@ -1673,13 +1670,6 @@ PHP_MINFO_FUNCTION(mbstring) snprintf(tmp, sizeof(tmp), "%d.%d.%d", MBFL_VERSION_MAJOR, MBFL_VERSION_MINOR, MBFL_VERSION_TEENY); php_info_print_table_row(2, "libmbfl version", tmp); } -#if HAVE_ONIG - { - char tmp[256]; - snprintf(tmp, sizeof(tmp), "%d.%d.%d", ONIGURUMA_VERSION_MAJOR, ONIGURUMA_VERSION_MINOR, ONIGURUMA_VERSION_TEENY); - php_info_print_table_row(2, "oniguruma version", tmp); - } -#endif php_info_print_table_end(); php_info_print_table_start(); |