Skip to content

Commit

Permalink
Remove PCRE detection, fix #5625
Browse files Browse the repository at this point in the history
  • Loading branch information
matyhtf committed Dec 23, 2024
1 parent d09264e commit 88a7b74
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ if test "$PHP_SWOOLE" != "no"; then
AC_CHECK_LIB(pthread, pthread_mutexattr_setpshared, AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETPSHARED, 1, [have pthread_mutexattr_setpshared]))
AC_CHECK_LIB(pthread, pthread_mutexattr_setrobust, AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST, 1, [have pthread_mutexattr_setrobust]))
AC_CHECK_LIB(pthread, pthread_mutex_consistent, AC_DEFINE(HAVE_PTHREAD_MUTEX_CONSISTENT, 1, [have pthread_mutex_consistent]))
AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE(HAVE_PCRE, 1, [have pcre]))

if test "$PHP_SWOOLE_DEV" = "yes"; then
AX_CHECK_COMPILE_FLAG(-Wbool-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wbool-conversion")
Expand Down
5 changes: 0 additions & 5 deletions ext-src/php_swoole.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ BEGIN_EXTERN_C()
#include "zend_exceptions.h"
#include "zend_extensions.h"

#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
#include "ext/pcre/php_pcre.h"
#endif
#include "ext/json/php_json.h"

#include "stubs/php_swoole_arginfo.h"
Expand Down Expand Up @@ -914,9 +912,6 @@ PHP_MINFO_FUNCTION(swoole) {
#ifdef SW_USE_CURL
php_info_print_table_row(2, "curl-native", "enabled");
#endif
#ifdef HAVE_PCRE
php_info_print_table_row(2, "pcre", "enabled");
#endif
#ifdef SW_USE_CARES
php_info_print_table_row(2, "c-ares", ares_version(nullptr));
#endif
Expand Down

0 comments on commit 88a7b74

Please # to comment.