summaryrefslogtreecommitdiff
path: root/ext/mbstring/mbstring.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-03-22 10:29:18 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-03-22 10:29:18 +0100
commite7e2056d1a993a01c9d57fb2261066855d282d8f (patch)
treef94116fdb65c1ef4c719f567bca0799aaf594988 /ext/mbstring/mbstring.c
parent5456a6ea92243d6028ea2012407dbef557113215 (diff)
downloadphp-git-e7e2056d1a993a01c9d57fb2261066855d282d8f.tar.gz
Remove HAVE_PCRE/HAVE_BUNDLED_PCRE checks
PCRE is always available.
Diffstat (limited to 'ext/mbstring/mbstring.c')
-rw-r--r--ext/mbstring/mbstring.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 004a1d40d6..48436550a4 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -60,7 +60,7 @@
# include "php_onig_compat.h"
# include <oniguruma.h>
# undef UChar
-#elif HAVE_PCRE || HAVE_BUNDLED_PCRE
+#else
# include "ext/pcre/php_pcre.h"
#endif
@@ -1043,7 +1043,7 @@ static void _php_mb_free_regex(void *opaque)
onig_free((php_mb_regex_t *)opaque);
}
/* }}} */
-#elif HAVE_PCRE || HAVE_BUNDLED_PCRE
+#else
/* {{{ _php_mb_compile_regex */
static void *_php_mb_compile_regex(const char *pattern)
{