diff options
93 files changed, 7 insertions, 402 deletions
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index 06e3e64ba1..74266e4166 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -179,7 +179,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [ libmbfl/nls/nls_tr.c libmbfl/nls/nls_ua.c ]) - PHP_MBSTRING_ADD_CFLAG([-DHAVE_CONFIG_H]) 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]) ]) diff --git a/ext/mbstring/config.w32 b/ext/mbstring/config.w32 index 4e7e8fd40e..667fdb9222 100644 --- a/ext/mbstring/config.w32 +++ b/ext/mbstring/config.w32 @@ -10,8 +10,7 @@ if (PHP_MBSTRING != "no") { STDOUT.WriteLine("Using bundled libmbfl..."); - ADD_FLAG("CFLAGS_MBSTRING", "-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \ - /D HAVE_CONFIG_H \ + ADD_FLAG("CFLAGS_MBSTRING", "-Iext/mbstring -Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \ /D HAVE_STRICMP /D MBFL_DLL_EXPORT=1 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1") FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32", diff --git a/ext/mbstring/libmbfl/filters/html_entities.c b/ext/mbstring/libmbfl/filters/html_entities.c index a9152c090c..32c9f7619f 100644 --- a/ext/mbstring/libmbfl/filters/html_entities.c +++ b/ext/mbstring/libmbfl/filters/html_entities.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "html_entities.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index df7b4db6e6..451860f435 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_7bit.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c index 41ddf41b19..697e37dee9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_armscii8.c @@ -26,10 +26,6 @@ * "armenian code filter and converter" */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_armscii8.h" #include "unicode_table_armscii8.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c index e31d968535..489f1deea3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_ascii.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index 765afe522e..f2cc65b4ae 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_base64.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index ad27b58bd3..692f449d54 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_big5.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index fcdd4a4c45..8a9f80fe56 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_byte2.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 4c2835ab1a..22ff22fd41 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_byte4.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index 806102dfc3..5295700e28 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp1251.h" #include "unicode_table_cp1251.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index c0cf0f43f0..7e9a69881d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp1252.h" #include "unicode_table_cp1252.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index 918428fbfb..2c9050f275 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp1254.h" #include "unicode_table_cp1254.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index aaa5219e6a..c2e2f997b8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -22,10 +22,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp5022x.h" #include "mbfilter_jis.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index f099f51389..f6f28faf12 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp51932.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 187ee0f468..93d4427b94 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -23,10 +23,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp850.h" #include "unicode_table_cp850.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 3a135558eb..1632f893de 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp866.h" #include "unicode_table_cp866.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index 49590622d7..19f6481d5c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp932.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c index 6c22dd0c13..8b36058b2c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp936.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp936.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_cp936.h" #define UNICODE_TABLE_CP936_DEF diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index eb39799b87..bff3bf9d0e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_euc_cn.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index c5a884ea0e..0802ab7b7d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_euc_jp.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index c8eff57e16..4cced6adcf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_euc_jp_2004.h" #include "mbfilter_sjis_2004.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index ac032770d0..c224bfe59d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_euc_jp_win.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c index 9e7925904b..d8c46345ed 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_euc_kr.h" #include "unicode_table_uhc.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c index f1174eab77..e1df5cf043 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_euc_tw.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index dcee840dbd..7e3900a1cf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_gb18030.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c index 0d66790448..eb80216ddb 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <string.h> #include "mbfilter.h" #include "mbfilter_htmlent.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_hz.c b/ext/mbstring/libmbfl/filters/mbfilter_hz.c index 13abc42766..217b890e9d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_hz.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_hz.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_hz.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c index 8c5605937b..98c1da6357 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso2022_jp_ms.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index 3fb856c2b7..af60eb9d65 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso2022_kr.h" #include "unicode_table_uhc.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index 79f88300eb..42224f4885 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso2022jp_2004.h" #include "mbfilter_sjis_2004.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c index bf45a8065c..73cb91cb05 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso2022jp_mobile.h" #include "mbfilter_sjis_mobile.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index 7c633d8b3a..ad876d53df 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_1.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index 65d82868f8..49599d43f5 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_10.h" #include "unicode_table_iso8859_10.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index 747db1325d..7a3193b66c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_13.h" #include "unicode_table_iso8859_13.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index 39268147e0..62ea49ca2f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_14.h" #include "unicode_table_iso8859_14.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c index 1ba311fc4e..702c260c3d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_15.h" #include "unicode_table_iso8859_15.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c index 65a9ce4269..f63df4a324 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_16.h" #include "unicode_table_iso8859_16.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index 23715c1101..4488ec49b9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_2.h" #include "unicode_table_iso8859_2.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index 6fd12c42f2..0f19aff8fc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_3.h" #include "unicode_table_iso8859_3.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index ffd647ef11..42b19152ad 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_4.h" #include "unicode_table_iso8859_4.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index 3144e1ff3e..d7674ab281 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_5.h" #include "unicode_table_iso8859_5.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index 443b522f34..9c44928685 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_6.h" #include "unicode_table_iso8859_6.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index 0931054ba0..6d475c9ccf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_7.h" #include "unicode_table_iso8859_7.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index 30a34994c7..0fe7fbe761 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_8.h" #include "unicode_table_iso8859_8.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index cf26ac43f6..7493e1519c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_iso8859_9.h" #include "unicode_table_iso8859_9.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index 93cb1e88ac..b100d32aba 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_jis.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c index 04dcf2d639..a0eb7dd08f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8r.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_koi8r.h" #include "unicode_table_koi8r.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c index d1e310bde7..0d75a43f82 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_koi8u.c @@ -24,10 +24,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_koi8u.h" #include "unicode_table_koi8u.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index 42dfde108b..a7438e6e69 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_qprint.h" #include "unicode_prop.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index f64fd13817..0fd98a167d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_sjis.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index 8079c926e3..43656e1446 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_sjis_2004.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index e52ea2f321..af21db07ba 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_sjis_mac.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index e3faa3fe20..28de982e86 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_sjis_mobile.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index a3cea99744..70f33370e3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_sjis_open.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index ffe493982b..02046b30e8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_ucs2.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 696788e559..9ce1fc931b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_ucs4.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index 1827292e0f..aa55395e90 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_uhc.h" #define UNICODE_TABLE_UHC_DEF diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index f5779e06c7..27e307c8e8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_utf16.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c index 460794f9d6..ac3c32b12c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_utf32.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index 424798d745..bc05adcb79 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_utf7.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c index d4ad592ca3..60097b4137 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_utf7imap.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c index f624e153a4..dac6e0afa9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_utf8.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index 173e9f3b9b..041d5fa799 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_utf8_mobile.h" diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index b6601fda9f..a78acd3718 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfilter.h" #include "mbfilter_uuencode.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index e8eb61e0f3..a1191716a1 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -79,20 +79,12 @@ * */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include "zend_operators.h" - #include <stddef.h> #include <string.h> -#include <limits.h> #include "mbfilter.h" #include "mbfl_filter_output.h" #include "mbfilter_8bit.h" -#include "mbfilter_pass.h" #include "mbfilter_wchar.h" #include "filters/mbfilter_ascii.h" #include "filters/mbfilter_base64.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c index 98c9644f9d..059feb0b3c 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index 34543786d8..5136bb1c72 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -27,10 +27,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c index b313cf580e..f69e70a64a 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> #include "mbfilter.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index 53a722f813..e301254e03 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> #include "mbfl_encoding.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c index a1522e2c30..3ecb06553d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c @@ -28,15 +28,11 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stddef.h> -#include <string.h> +#include "libmbfl/config.h" #ifdef HAVE_STRINGS_H -#include <strings.h> + /* For strcasecmp */ + #include <strings.h> #endif #include "mbfl_encoding.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c b/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c index df01450db2..ab2b2fc09e 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "mbfl_convert.h" #include "mbfl_filter_output.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c index 9102101a0b..d151f6cc66 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c @@ -28,10 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> #include "mbfl_ident.h" diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index bbc07f0bda..8e4d8f776d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "libmbfl/config.h" #include <stddef.h> #include <string.h> diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c index 46f3fae2f8..09746efcd0 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c @@ -28,15 +28,10 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> #include <string.h> #include "zend.h" -#include "mbfl_string.h" #include "mbfl_memory_device.h" /* diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index bb3e945bfc..a036356dd2 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -28,12 +28,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stddef.h> - #include "mbfl_string.h" #include "mbfilter_pass.h" diff --git a/ext/mbstring/libmbfl/nls/nls_de.c b/ext/mbstring/libmbfl/nls/nls_de.c index 729f71840f..9e9dae7cab 100644 --- a/ext/mbstring/libmbfl/nls/nls_de.c +++ b/ext/mbstring/libmbfl/nls/nls_de.c @@ -1,10 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stddef.h> - -#include "mbfilter.h" #include "nls_de.h" static const char *mbfl_language_german_aliases[] = {"Deutsch", NULL}; diff --git a/ext/mbstring/libmbfl/nls/nls_en.c b/ext/mbstring/libmbfl/nls/nls_en.c index 15522eb575..e029a7f291 100644 --- a/ext/mbstring/libmbfl/nls/nls_en.c +++ b/ext/mbstring/libmbfl/nls/nls_en.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_en.h" const mbfl_language mbfl_language_english = { diff --git a/ext/mbstring/libmbfl/nls/nls_hy.c b/ext/mbstring/libmbfl/nls/nls_hy.c index 7344abbb21..a1df967d83 100644 --- a/ext/mbstring/libmbfl/nls/nls_hy.c +++ b/ext/mbstring/libmbfl/nls/nls_hy.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_hy.h" const mbfl_language mbfl_language_armenian = { diff --git a/ext/mbstring/libmbfl/nls/nls_ja.c b/ext/mbstring/libmbfl/nls/nls_ja.c index c3b3694bf5..181898c541 100644 --- a/ext/mbstring/libmbfl/nls/nls_ja.c +++ b/ext/mbstring/libmbfl/nls/nls_ja.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_ja.h" const mbfl_language mbfl_language_japanese = { diff --git a/ext/mbstring/libmbfl/nls/nls_kr.c b/ext/mbstring/libmbfl/nls/nls_kr.c index a8373b3eab..127d1f0d6c 100644 --- a/ext/mbstring/libmbfl/nls/nls_kr.c +++ b/ext/mbstring/libmbfl/nls/nls_kr.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_kr.h" const mbfl_language mbfl_language_korean = { diff --git a/ext/mbstring/libmbfl/nls/nls_neutral.c b/ext/mbstring/libmbfl/nls/nls_neutral.c index 58eed2a5c2..139fe2e24e 100644 --- a/ext/mbstring/libmbfl/nls/nls_neutral.c +++ b/ext/mbstring/libmbfl/nls/nls_neutral.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_neutral.h" const mbfl_language mbfl_language_neutral = { diff --git a/ext/mbstring/libmbfl/nls/nls_ru.c b/ext/mbstring/libmbfl/nls/nls_ru.c index c4526305d1..6f0bc1cec1 100644 --- a/ext/mbstring/libmbfl/nls/nls_ru.c +++ b/ext/mbstring/libmbfl/nls/nls_ru.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_ru.h" const mbfl_language mbfl_language_russian = { diff --git a/ext/mbstring/libmbfl/nls/nls_tr.c b/ext/mbstring/libmbfl/nls/nls_tr.c index f1a9950e5c..6c2b778229 100644 --- a/ext/mbstring/libmbfl/nls/nls_tr.c +++ b/ext/mbstring/libmbfl/nls/nls_tr.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_tr.h" const mbfl_language mbfl_language_turkish = { diff --git a/ext/mbstring/libmbfl/nls/nls_ua.c b/ext/mbstring/libmbfl/nls/nls_ua.c index 8f75b34cdb..df4e6ef7b3 100644 --- a/ext/mbstring/libmbfl/nls/nls_ua.c +++ b/ext/mbstring/libmbfl/nls/nls_ua.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_ua.h" const mbfl_language mbfl_language_ukrainian = { diff --git a/ext/mbstring/libmbfl/nls/nls_uni.c b/ext/mbstring/libmbfl/nls/nls_uni.c index cd061d185c..e8ec5c795a 100644 --- a/ext/mbstring/libmbfl/nls/nls_uni.c +++ b/ext/mbstring/libmbfl/nls/nls_uni.c @@ -1,10 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stddef.h> - -#include "mbfilter.h" #include "nls_uni.h" static const char *mbfl_language_uni_aliases[] = {"universal", NULL}; diff --git a/ext/mbstring/libmbfl/nls/nls_zh.c b/ext/mbstring/libmbfl/nls/nls_zh.c index 45a59e468d..8dc2e3144d 100644 --- a/ext/mbstring/libmbfl/nls/nls_zh.c +++ b/ext/mbstring/libmbfl/nls/nls_zh.c @@ -1,10 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stddef.h> - -#include "mbfilter.h" #include "nls_zh.h" const mbfl_language mbfl_language_simplified_chinese = { diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 5af2d8a486..951b59fb9c 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -16,10 +16,6 @@ */ /* {{{ includes */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "php.h" #include "php_ini.h" #include "php_variables.h" diff --git a/ext/mbstring/mb_gpc.h b/ext/mbstring/mb_gpc.h index fb4f927820..9ee258e941 100644 --- a/ext/mbstring/mb_gpc.h +++ b/ext/mbstring/mb_gpc.h @@ -16,10 +16,6 @@ */ /* {{{ includes */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "php.h" /* }}} */ diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index b1ca1f4056..6d19d25156 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -18,10 +18,7 @@ */ /* {{{ includes */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - +#include "libmbfl/config.h" #include "php.h" #include "php_ini.h" #include "php_variables.h" diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index 380e0b4568..af15a30f75 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -19,11 +19,6 @@ #ifndef _MBSTRING_H #define _MBSTRING_H -#ifdef COMPILE_DL_MBSTRING -#undef HAVE_MBSTRING -#define HAVE_MBSTRING 1 -#endif - #include "php_version.h" #define PHP_MBSTRING_VERSION PHP_VERSION @@ -44,7 +39,6 @@ # define MBSTRING_API /* nothing special */ #endif - #ifdef HAVE_MBSTRING #include "libmbfl/mbfl/mbfilter.h" 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" diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c index 37a996b8be..c96d9b7180 100644 --- a/ext/mbstring/php_unicode.c +++ b/ext/mbstring/php_unicode.c @@ -28,12 +28,7 @@ all copies or substantial portions of the Software. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "php.h" -#include "php_ini.h" #ifdef HAVE_MBSTRING |