archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove redundant includes from mbstring (and make sure correct config.h is used)

Browse source 
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.
This commit is contained in:
Alex Dowad 2020-07-04 23:52:32 +02:00
parent b7808d02e8
commit 62317d592f
93 changed files with 7 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mbstring/php_mbregex.c
View file

@ -14,9 +14,7 @@
+----------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "libmbfl/config.h"
#include "php.h"
#include "php_ini.h"