Skip to content

Commit 62317d5

Browse files
alexdowadalexdowad
committed
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.
1 parent b7808d0 commit 62317d5

File tree

93 files changed

+7
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+7
-402
lines changed

‎ext/mbstring/config.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
179179
libmbfl/nls/nls_tr.c
180180
libmbfl/nls/nls_ua.c
181181
])
182-
PHP_MBSTRING_ADD_CFLAG([-DHAVE_CONFIG_H])
183182
PHP_MBSTRING_ADD_INSTALL_HEADERS([libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h])
184183
])
185184

‎ext/mbstring/config.w32

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ if (PHP_MBSTRING != "no") {
1010

1111
STDOUT.WriteLine("Using bundled libmbfl...");
1212

13-
ADD_FLAG("CFLAGS_MBSTRING", "-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
14-
/D HAVE_CONFIG_H \
13+
ADD_FLAG("CFLAGS_MBSTRING", "-Iext/mbstring -Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
1514
/D HAVE_STRICMP /D MBFL_DLL_EXPORT=1 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1")
1615

1716
FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32",

‎ext/mbstring/libmbfl/filters/html_entities.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "html_entities.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_7bit.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
34-
3531
#include "mbfilter.h"
3632
#include "mbfilter_7bit.h"
3733

‎ext/mbstring/libmbfl/filters/mbfilter_armscii8.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
* "armenian code filter and converter"
2727
*/
2828

29-
#ifdef HAVE_CONFIG_H
30-
#include "config.h"
31-
#endif
32-
3329
#include "mbfilter.h"
3430
#include "mbfilter_armscii8.h"
3531
#include "unicode_table_armscii8.h"

‎ext/mbstring/libmbfl/filters/mbfilter_ascii.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
34-
3531
#include "mbfilter.h"
3632
#include "mbfilter_ascii.h"
3733

‎ext/mbstring/libmbfl/filters/mbfilter_base64.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
34-
3531
#include "mbfilter.h"
3632
#include "mbfilter_base64.h"
3733

‎ext/mbstring/libmbfl/filters/mbfilter_big5.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_big5.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_byte2.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
34-
3531
#include "mbfilter.h"
3632
#include "mbfilter_byte2.h"
3733

‎ext/mbstring/libmbfl/filters/mbfilter_byte4.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
*
2929
*/
3030

31-
#ifdef HAVE_CONFIG_H
32-
#include "config.h"
33-
#endif
34-
3531
#include "mbfilter.h"
3632
#include "mbfilter_byte4.h"
3733

‎ext/mbstring/libmbfl/filters/mbfilter_cp1251.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp1251.h"
3632
#include "unicode_table_cp1251.h"

‎ext/mbstring/libmbfl/filters/mbfilter_cp1252.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp1252.h"
3632
#include "unicode_table_cp1252.h"

‎ext/mbstring/libmbfl/filters/mbfilter_cp1254.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp1254.h"
3632
#include "unicode_table_cp1254.h"

‎ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
*
2323
*/
2424

25-
#ifdef HAVE_CONFIG_H
26-
#include "config.h"
27-
#endif
28-
2925
#include "mbfilter.h"
3026
#include "mbfilter_cp5022x.h"
3127
#include "mbfilter_jis.h"

‎ext/mbstring/libmbfl/filters/mbfilter_cp51932.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp51932.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_cp850.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
*
2424
*/
2525

26-
#ifdef HAVE_CONFIG_H
27-
#include "config.h"
28-
#endif
29-
3026
#include "mbfilter.h"
3127
#include "mbfilter_cp850.h"
3228
#include "unicode_table_cp850.h"

‎ext/mbstring/libmbfl/filters/mbfilter_cp866.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp866.h"
3632
#include "unicode_table_cp866.h"

‎ext/mbstring/libmbfl/filters/mbfilter_cp932.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp932.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_cp936.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_cp936.h"
3632
#define UNICODE_TABLE_CP936_DEF

‎ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_euc_cn.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_euc_jp.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_euc_jp_2004.h"
3632
#include "mbfilter_sjis_2004.h"

‎ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_euc_jp_win.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_euc_kr.h"
3632
#include "unicode_table_uhc.h"

‎ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_euc_tw.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_gb18030.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_gb18030.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_htmlent.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include <string.h>
3531
#include "mbfilter.h"
3632
#include "mbfilter_htmlent.h"

‎ext/mbstring/libmbfl/filters/mbfilter_hz.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_hz.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso2022_jp_ms.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso2022_kr.h"
3632
#include "unicode_table_uhc.h"

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso2022jp_2004.h"
3632
#include "mbfilter_sjis_2004.h"

‎ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso2022jp_mobile.h"
3632
#include "mbfilter_sjis_mobile.h"

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso8859_1.h"
3632

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso8859_10.h"
3632
#include "unicode_table_iso8859_10.h"

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso8859_13.h"
3632
#include "unicode_table_iso8859_13.h"

‎ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
*
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
31-
#include "config.h"
32-
#endif
33-
3430
#include "mbfilter.h"
3531
#include "mbfilter_iso8859_14.h"
3632
#include "unicode_table_iso8859_14.h"

0 commit comments

Comments
 (0)