- MFB (fixes build)

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index b2f2c3aa895a0f00bb81cfeebcc38a6ab58e7295..e61ba3c1b2a714a97284bd273129ef0a204d912a 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -268,6 +268,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
      libmbfl/filters/mbfilter_utf7imap.c
      libmbfl/filters/mbfilter_utf8.c
      libmbfl/filters/mbfilter_uuencode.c
+     libmbfl/filters/mbfilter_cp850.c
      libmbfl/mbfl/mbfilter.c
      libmbfl/mbfl/mbfilter_8bit.c
      libmbfl/mbfl/mbfilter_pass.c

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_consts.h b/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
index cf4eaff1db5975930e0df74278fa726901e959df..b6c0bb2d871a6d03453f00d58e9b994f77fab70c 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
@@ -73,10 +73,13 @@
 #define MBFL_WCSPLANE_CNS11643         0x70f50000              /*  2121h - 9898h */
 #define MBFL_WCSPLANE_UHC              0x70f60000              /*  8141h - fefeh */
 #define MBFL_WCSPLANE_CP1251           0x70f70000      
-#define MBFL_WCSPLANE_CP866                    0x70f80000      
+#define MBFL_WCSPLANE_CP866            0x70f80000      
 #define MBFL_WCSPLANE_KOI8R            0x70f90000      
 #define MBFL_WCSPLANE_8859_16          0x70fa0000              /*  00h - FFh */
 #define MBFL_WCSPLANE_ARMSCII8                 0x70fb0000
+#define MBFL_WCSPLANE_KOI8U            0x70fc0000
+#define MBFL_WCSPLANE_CP1254           0x70fd0000              /*  00h - FFh */
+#define MBFL_WCSPLANE_CP850            0x70fe0000              /*  00h - FFh */
 #define MBFL_WCSGROUP_MASK                0xffffff
 #define MBFL_WCSGROUP_UCS4MAX          0x70000000
 #define MBFL_WCSGROUP_WCHARMAX         0x78000000

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
index 2d06bbd316afd228ff0eccb7bc6819495f14aad8..17e00dd5952140364965ab511facc39be8c51a9e 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
@@ -90,6 +90,7 @@
 #include "filters/mbfilter_ucs2.h"
 #include "filters/mbfilter_htmlent.h"
 #include "filters/mbfilter_armscii8.h"
+#include "filters/mbfilter_cp850.h"
 
 static void mbfl_convert_filter_reset_vtbl(mbfl_convert_filter *filter);
 
@@ -216,6 +217,8 @@ const struct mbfl_convert_vtbl *mbfl_convert_filter_list[] = {
        &vtbl_wchar_byte2le,
        &vtbl_armscii8_wchar,
        &vtbl_wchar_armscii8,
+       &vtbl_cp850_wchar,
+       &vtbl_wchar_cp850,
        &vtbl_pass,
        NULL
 };

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
index 3c18fca974797dc9f60a3688cefbef2b581780d1..2e5b4abaf80711c9fd2cd11cd709c5d2d652d8e9 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
@@ -97,6 +97,7 @@
 #include "filters/mbfilter_ucs2.h"
 #include "filters/mbfilter_htmlent.h"
 #include "filters/mbfilter_armscii8.h"
+#include "filters/mbfilter_cp850.h"
 
 #ifndef HAVE_STRCASECMP
 #ifdef HAVE_STRICMP
@@ -181,6 +182,7 @@ static const mbfl_encoding *mbfl_encoding_ptr_list[] = {
        &mbfl_encoding_cp866,
        &mbfl_encoding_koi8r,
        &mbfl_encoding_armscii8,
+       &mbfl_encoding_cp850,
        NULL
 };
 

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
index af93b6ea504ae7f29535a39718dda1bbe586ac72..351a21717082a8eb6756a73ec9b06df12463b6ef 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
@@ -101,6 +101,7 @@ enum mbfl_no_encoding {
        mbfl_no_encoding_koi8r,
        mbfl_no_encoding_8859_16,
        mbfl_no_encoding_armscii8,
+       mbfl_no_encoding_cp850,
        mbfl_no_encoding_charset_max
 };
 

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
index 40c964c2050dc40b8a579b2deea04405181bc08a..ade0f2a1ab71da83bb59b2a7fbd03e331ba1026c 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
@@ -88,6 +88,7 @@
 #include "filters/mbfilter_ucs2.h"
 #include "filters/mbfilter_htmlent.h"
 #include "filters/mbfilter_armscii8.h"
+#include "filters/mbfilter_cp850.h"
 
 static const struct mbfl_identify_vtbl vtbl_identify_false = {
        mbfl_no_encoding_pass,
@@ -133,6 +134,7 @@ static const struct mbfl_identify_vtbl *mbfl_identify_filter_list[] = {
        &vtbl_identify_8859_14,
        &vtbl_identify_8859_15,
        &vtbl_identify_armscii8,
+       &vtbl_identify_cp850,
        &vtbl_identify_false,
        NULL
 };

diff --git a/ext/mbstring/mbstring.dsp b/ext/mbstring/mbstring.dsp
index 629b0bd4d94c7973eedb6921948196e0694eaf31..2e050c6d2018b4d06a2af9519d738d6c1ddaa319 100644 (file)
--- a/ext/mbstring/mbstring.dsp
+++ b/ext/mbstring/mbstring.dsp
@@ -374,6 +374,10 @@ SOURCE=.\libmbfl\filters\mbfilter_armscii8.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\libmbfl\filters\mbfilter_cp850.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\libmbfl\mbfl\mbfilter_pass.c\r
 # End Source File\r
 # Begin Source File\r
@@ -687,6 +691,10 @@ SOURCE=.\libmbfl\filters\mbfilter_armscii8.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\libmbfl\filters\mbfilter_cp850.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\libmbfl\mbfl\mbfilter_pass.h\r
 # End Source File\r
 # Begin Source File\r
@@ -911,6 +919,10 @@ SOURCE=.\libmbfl\filters\unicode_table_armscii8.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\libmbfl\filters\unicode_table_cp850.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\libmbfl\filters\unicode_table_uhc.h\r
 # End Source File\r
 # End Group\r