diff options
| author | Alex Dowad <alexinbeijing@gmail.com> | 2020-07-04 23:52:32 +0200 |
|---|---|---|
| committer | Alex Dowad <alexinbeijing@gmail.com> | 2020-08-31 23:17:58 +0200 |
| commit | 62317d592fd6e6df34e68214c9277a979c898de6 (patch) | |
| tree | c924f50690f41daed021c8ea65276a2983e71c2f /ext/mbstring/php_mbregex.c | |
| parent | b7808d02e874faee6b90fac9e856736d7f8e05b2 (diff) | |
| download | php-git-62317d592fd6e6df34e68214c9277a979c898de6.tar.gz | |
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.
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 4 |
1 files changed, 1 insertions, 3 deletions
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" |