From 62317d592fd6e6df34e68214c9277a979c898de6 Mon Sep 17 00:00:00 2001 From: Alex Dowad Date: Sat, 4 Jul 2020 23:52:32 +0200 Subject: Remove redundant includes from mbstring (and make sure correct config.h is used) Very interesting... it turns out that when Valgrind support was enabled, `#include "config.h"` from within mbstring was actually including the file "config.h" from Valgrind, and not the one from mbstring!! This is because -I/usr/include/valgrind was added to the compiler invocation _before_ -Iext/mbstring/libmbfl. Make sure we actually include the file which was intended. --- ext/mbstring/php_mbregex.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ext/mbstring/php_mbregex.c') diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 0481116560..b5bd79fbe4 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -14,9 +14,7 @@ +----------------------------------------------------------------------+ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "libmbfl/config.h" #include "php.h" #include "php_ini.h" -- cgit v1.2.1