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.

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 06e3e64ba189d5a44bcd2864edece18abf345dc5..74266e4166206354c67ea27e35b9ecc77b5c864e 100644 (file)
--- 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 4e7e8fd40e6b2a7ec7d598de15fcd07dcbfaac13..667fdb9222eccd774e9b3d59aec792c2fc25f1bf 100644 (file)
--- 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 a9152c090cd6a31642d2534d3b969519e67446c7..32c9f7619f3cada91460fdf123404bdf52a073e7 100644 (file)
--- 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 df7b4db6e64b156c7ebe92049a75bb3c93e9ec64..451860f435bfebd8f6da96b471967b6c61bb2c64 100644 (file)
--- 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 41ddf41b1940bed9f53dc61a8e949071bf843137..697e37dee9976d03d63f2d6c031e5fa13ff955f0 100644 (file)
--- 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 e31d968535706fbce35803a21cc62d3315fdf98b..489f1deea340ac9ddb5ff2c0690b3591b9b28b6c 100644 (file)
--- 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 765afe522e4633a70ed197462354baf7f55a64d3..f2cc65b4ae34d0110b896ad47765185ed8977a29 100644 (file)
--- 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 ad27b58bd32021bb360901542279b8d6a838f71f..692f449d542934042951532f4d7715f4e3baa4cb 100644 (file)
--- 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 fcdd4a4c450cff07de180569b42a08d049a7a1a7..8a9f80fe56981529b9e1fdbd6c51f81ba8776373 100644 (file)
--- 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 4c2835ab1afe874b21c01c63734bba58f3eb80a4..22ff22fd41b0e49bc4fd8ef49f5c43445bc25c28 100644 (file)
--- 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 806102dfc37e9d2fff5ea131e9b32b07dac6e1b4..5295700e2888aacd1ee2233aa23f2ea1fff906e2 100644 (file)
--- 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 c0cf0f43f08fb70a785b988cc2b9b5c54119aad7..7e9a69881d7671b58c3546d14eac1c27f4a3c6b5 100644 (file)
--- 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 918428fbfb83a2bd880fca0d7ba1f32b0e3ba4b7..2c9050f2759753b173bc38f070bfe4f4cbbca104 100644 (file)
--- 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 aaa5219e6adec48d235cfd88ae79c2a9619a4a2d..c2e2f997b8c49945cfbf9b146b6081886577adce 100644 (file)
--- 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 f099f51389b4871e2945fa5f031f74e87d843b9a..f6f28faf12ac52ef39836732ac2dfb3b6d658c9f 100644 (file)
--- 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 187ee0f468c725b52a94c919ad0264115403634b..93d4427b94daead6bf9c0d70e7e8244036203e87 100644 (file)
--- 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 3a135558eb896bf142f0322d96b7e0e0639d307b..1632f893dea9f876e457228824d2675ab7604755 100644 (file)
--- 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 49590622d799f1f4d33763c686e3c9ebb8b9116b..19f6481d5cda1338e26fd5e70272bb0900a8f555 100644 (file)
--- 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 6c22dd0c135b676f04a18fc4b88dbe9411208555..8b36058b2cc4cf68741d83d5dcc1e4f7f0aafa7d 100644 (file)
--- 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 eb39799b87ee054f6cb1751513b50c6c4cac133f..bff3bf9d0eb663dce02cae53debdfd17688f6f68 100644 (file)
--- 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 c5a884ea0ed1f360f9166f6dabb105d19a4424ef..0802ab7b7d50b1829eb23ad6935ceb731370c04b 100644 (file)
--- 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 c8eff57e169bcfa0c16b22f368716f21fe2a2365..4cced6adcf24864ba339c3bb629dfd1d198f50eb 100644 (file)
--- 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 ac032770d066d48619fa3afbbfbd8bf65df7207d..c224bfe59d22ee91c03416e9458828792379358b 100644 (file)
--- 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 9e7925904b8d3a4698cca4cb0360a79995e88701..d8c46345ed4770a836daf7285d31935c38b77e59 100644 (file)
--- 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 f1174eab77fc7c66911a7263cc2cb1ac3dc13c05..e1df5cf0437c9bcae38c63543014e80a279e64ae 100644 (file)
--- 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 dcee840dbd8088765c15e2aebe0097be23b15603..7e3900a1cf5043fc5844d4a322061f2da4d2b8fe 100644 (file)
--- 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 0d667904486c436056ec27835bbe8846d9e10ed5..eb80216ddbae87cb23429da32c10e7f60cd3397e 100644 (file)
--- 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 13abc427666f1e08c28027f213e16dc09bfd56a5..217b890e9d14c56948bd63e2a062562cf38bc501 100644 (file)
--- 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 8c5605937b743a847539dbd4a53481403ff8c1e1..98c1da635776e3a91ce8e7ba3d13aded747b0c07 100644 (file)
--- 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 3fb856c2b7f86fd938589c1e52017fb2d77f9790..af60eb9d65616a81847fd14ecda1b8a89ae12e89 100644 (file)
--- 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 79f88300eb9b96f9558377314d83b104c9bc4bd1..42224f48853496a7d5f404e8af3a7b22b90bcb75 100644 (file)
--- 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 bf45a8065c05dbfca93a73bcafad8ed2356a03c1..73cb91cb05c23cb87a520cdecca7f7a8f10a596b 100644 (file)
--- 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 7c633d8b3a78dafce32a121b598cf66cd2283f2a..ad876d53dfcd6adfb45d17a749ad720c26b55139 100644 (file)
--- 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 65d82868f8b2a88c6bd945b6e14dbf5ece1fc769..49599d43f5b76b89861d420e10135c5d865f1a4e 100644 (file)
--- 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 747db1325d0e34fed0c449887cbb10487e031f82..7a3193b66c1798beb562b3de99784c0c397dafb1 100644 (file)
--- 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 39268147e0e37281f40f2a6c0162aead295ba8a3..62ea49ca2f4ff35b919b6fd6fb706d59c2e92428 100644 (file)
--- 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 1ba311fc4e6ac578d7c3c1b6e15f22761887da09..702c260c3d0fe03a0c281ff2f70e7c02e50db1cc 100644 (file)
--- 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 65a9ce42696e9060cae21fa92e7b0b126896469a..f63df4a32494ffaf31f765abff19229cd68f1cad 100644 (file)
--- 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 23715c1101e5e034d466a739939adfa4da294f6e..4488ec49b9073308e1616c3de11eae7bd05aa1e2 100644 (file)
--- 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 6fd12c42f2afba05b565ce3f55ddc5b37e51044d..0f19aff8fced3d5ae3998ff69ac7731e4fe417c1 100644 (file)
--- 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 ffd647ef11392bd6c9f6b077771be7008d4a2fc3..42b19152add10b3f20495682110f6a39cd09e93a 100644 (file)
--- 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 3144e1ff3edab703a8cf129006dba45e4a71a18b..d7674ab28130d0405e815e8297bf25a72618cc0d 100644 (file)
--- 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 443b522f34c8e9efcfdcfb996f3dda5249d2f701..9c44928685c2eaa5f45a7d1e4874b16b71828285 100644 (file)
--- 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 0931054ba026a0574b230c665e7e2e451a6a5111..6d475c9ccff8bd5cb7e15916deb222bd7ccafedf 100644 (file)
--- 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 30a34994c704c1463fb63cc0d88d5142254e0566..0fe7fbe761f6d94b9349b5f281150332a998c335 100644 (file)
--- 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 cf26ac43f6e13dff135050efd5103bef07b7749e..7493e1519c7a20048778989a8db88801ec7f9e2f 100644 (file)
--- 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 93cb1e88ac541862446f6f88ae4eedcdb2c2d918..b100d32abac4a7adf5ff9f8f4baaf293c64c5886 100644 (file)
--- 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 04dcf2d639a239f8fbafc5edeac955d94f8a3b9f..a0eb7dd08fe125f9ead360e5a29d67b00487f76f 100644 (file)
--- 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 d1e310bde72c90ec73eb7f3101b19e26793f40ad..0d75a43f82c7c43fc98dd84a6515caabb43695b8 100644 (file)
--- 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 42dfde108b92830588644e02a750f8e48c651e9d..a7438e6e6991e4de2ac61ad2b2c417746a43c5f1 100644 (file)
--- 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 f64fd13817da37fab66211f2b50ff0e8d58be22e..0fd98a167dbf36c52c301d2a9f316811646768d2 100644 (file)
--- 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 8079c926e36fdd3e2b0f8bfa510674b5996651c4..43656e144695e481e8c7b08c5a15342a15e1ff0d 100644 (file)
--- 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 e52ea2f321c47b37a2df0d0a07e68d9c8a7f74d6..af21db07ba83feb88cdaf8a16b00d09a8ab99c81 100644 (file)
--- 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 e3faa3fe20c8ad19122982e63750aefbf9005e6d..28de982e8698f04485374ec4999c268f9f377b99 100644 (file)
--- 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 a3cea997447e4071f7c7b92bc30be67da4ad6686..70f33370e345808f6e1a6a0f41660b9ca19f3f5a 100644 (file)
--- 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 ffe493982b48a363eddc6ab9ad3fee9d5e693ee6..02046b30e856ceba77d89592c3fe9656b1941d2f 100644 (file)
--- 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 696788e5597be5e2cd2593b5493d6a23cf64116d..9ce1fc931be9b18bf3c4e636b63239902a8c24d0 100644 (file)
--- 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 1827292e0fa6f0d04602e062caaaeffc73541bb1..aa55395e9055f8c41c6b0bbd350f4c8685c08e5e 100644 (file)
--- 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 f5779e06c7db3decc799f91dae070739ad5601a0..27e307c8e8dabcbf07bbb471faba4e489b670b1d 100644 (file)
--- 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 460794f9d64d01ab4b083182578ffc256f11789a..ac3c32b12c8d659fb01731f2f013faa436f148a6 100644 (file)
--- 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 424798d74594bebb7a47a1a9c2446ceb1e0b3025..bc05adcb79fc29e211037f617bdabd4480fb74b9 100644 (file)
--- 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 d4ad592ca3ac0f2609983c015ef217f87a4bc148..60097b4137bbc18e532f08ee96b3f2ae6794a0ff 100644 (file)
--- 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 f624e153a42e52ff1da16a2b6061dd98d5da5426..dac6e0afa933060cfcb13a963dac1a482ae3d36e 100644 (file)
--- 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 173e9f3b9b958ad36840c505157a2d09f4a47921..041d5fa799a9133c33456ab23d5d58e36b3976df 100644 (file)
--- 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 b6601fda9f7ad52ac638c5cb416f519dee9d83c5..a78acd3718772120964c1c9a9b17d5e8cf48ed33 100644 (file)
--- 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 e8eb61e0f3d18606b1032134be7d6cd20e94585c..a1191716a170f3ccf7815ca7343758832723e2f1 100644 (file)
--- 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 98c9644f9dab0d2cf591dd1be1ed26e2a68b5150..059feb0b3c4ec6cf83395e530a1d73b6329a5a8c 100644 (file)
--- 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 34543786d8258bf9b0256938e460663295e0e8c9..5136bb1c72982c606795f09fd113622640eed001 100644 (file)
--- 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 b313cf580e9f5b0f05e68c65518d284b32c6aade..f69e70a64a423f723f278a6017e802cd05847d23 100644 (file)
--- 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 53a722f8138ba6c5efa4d360193fd109b7775e0c..e301254e031a3f01bb37c052ad8f5ba55183a6ee 100644 (file)
--- 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 a1522e2c30f775e327f36e10f0ffc09feb210f20..3ecb06553d2b6de37d5252bff473d02ef61cfb3c 100644 (file)
--- 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 df01450db28c7c781a39d9a4e3584426883f3da9..ab2b2fc09e64d51397cf44a0c151a6a3deb5b1d7 100644 (file)
--- 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 9102101a0b36b4e378d62f18fe9743ab21261a8a..d151f6cc6673faa86b5add3b07c525b206c6daeb 100644 (file)
--- 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 bbc07f0bdab8d9ea335a0d5f00f01ebf5fac0fd2..8e4d8f776d8769e5339c6bba58812ddd5fcab937 100644 (file)
--- 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 46f3fae2f8d7be02c3aa1c5c33c983780c5f33f9..09746efcd071ebe5f4b287ff58e18fca2c329e09 100644 (file)
--- 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 bb3e945bfc4a455a710ae0224935ea337d2b1533..a036356dd2ce16963b9ffc5b7734e6c5c47f1f6b 100644 (file)
--- 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 729f71840fa8008500744daea8e5623d919fa30d..9e9dae7cab6f90f6b837a2213a726c060e66b23d 100644 (file)
--- 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 15522eb57590248fc6689a6a1204efa220a9304b..e029a7f2915a69b08cbd3c32a035567809e96b0f 100644 (file)
--- 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 7344abbb2105e26bf397b8c299a869e957aa6d25..a1df967d833336149c0995d60a395ac6befe6d7f 100644 (file)
--- 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 c3b3694bf51e0d2b19c7c910595aada110cf262b..181898c5416ef31a65c3008e1ddb2322e691fa0c 100644 (file)
--- 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 a8373b3eab40c7b71d11340ec697b884cf25a633..127d1f0d6c07937883a1846f41d6fddccea1b646 100644 (file)
--- 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 58eed2a5c2313ff748a6201e73b4c5a297813636..139fe2e24e31f7acd0eaf2f9c5cba74204c2184e 100644 (file)
--- 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 c4526305d1d5d72f9420a5ef836bde140d7eb953..6f0bc1cec190f4fafa2638a8bd52413c625cf2e2 100644 (file)
--- 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 f1a9950e5c899ffb1f6de5d56e9ae5ae1d783efa..6c2b77822945c1f4ff8301005f03e588640c8801 100644 (file)
--- 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 8f75b34cdbc4137b48dec6e3bc268437fb91e1e1..df4e6ef7b3121e3085f2ef363efd7fd819391531 100644 (file)
--- 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 cd061d185ca6ea09450df18939fab284f83041de..e8ec5c795afd5c95e0a6f6754a1378928ef966ad 100644 (file)
--- 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 45a59e468d4f0e8b77d64b06e63890129cd3cd0b..8dc2e3144d514cae9f1da8ef900731c77e1c2c76 100644 (file)
--- 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 5af2d8a486b1917fe6670f4a586f8f32c87193b0..951b59fb9cb3c6e50842d389c41c20b47a3ce5f7 100644 (file)
--- 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 fb4f9278201fead8b77c45fce62d52a9bdc9d70b..9ee258e9413242f3d67a4341f497892e2012d5e7 100644 (file)
--- 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 b1ca1f4056affcca1e2d3ecfe7b874af5b574742..6d19d25156e5c9af904673472d048d458f394419 100644 (file)
--- 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 380e0b45689d6000c9bf89c2d980ff3da24398f2..af15a30f753e352f4d0e157ae04e389d21c9eed8 100644 (file)
--- 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 04811165600320d5688eb3289eb930b5267082f9..b5bd79fbe4399280ddc9f8bed8f996cd8bef6233 100644 (file)
--- 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 37a996b8beb89e7e5dc431e57d36abeadfd4ec2f..c96d9b7180f3982cc63a779d7ae12b754d412666 100644 (file)
--- 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