From 7f5d554cdee00954cf12f505fc95c6eb23c77091 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Thu, 16 Apr 2009 02:05:00 +0000
Subject: [PATCH] - MFB (fixes build)

---
 ext/mbstring/config.m4                    |  1 +
 ext/mbstring/libmbfl/mbfl/mbfl_consts.h   |  5 ++++-
 ext/mbstring/libmbfl/mbfl/mbfl_convert.c  |  3 +++
 ext/mbstring/libmbfl/mbfl/mbfl_encoding.c |  2 ++
 ext/mbstring/libmbfl/mbfl/mbfl_encoding.h |  1 +
 ext/mbstring/libmbfl/mbfl/mbfl_ident.c    |  2 ++
 ext/mbstring/mbstring.dsp                 | 12 ++++++++++++
 7 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index b2f2c3aa89..e61ba3c1b2 100644
--- 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 cf4eaff1db..b6c0bb2d87 100644
--- 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 2d06bbd316..17e00dd595 100644
--- 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 3c18fca974..2e5b4abaf8 100644
--- 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 af93b6ea50..351a217170 100644
--- 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 40c964c205..ade0f2a1ab 100644
--- 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 629b0bd4d9..2e050c6d20 100644
--- a/ext/mbstring/mbstring.dsp
+++ b/ext/mbstring/mbstring.dsp
@@ -374,6 +374,10 @@ SOURCE=.\libmbfl\filters\mbfilter_armscii8.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\libmbfl\filters\mbfilter_cp850.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\libmbfl\mbfl\mbfilter_pass.c
 # End Source File
 # Begin Source File
@@ -687,6 +691,10 @@ SOURCE=.\libmbfl\filters\mbfilter_armscii8.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\libmbfl\filters\mbfilter_cp850.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\libmbfl\mbfl\mbfilter_pass.h
 # End Source File
 # Begin Source File
@@ -911,6 +919,10 @@ SOURCE=.\libmbfl\filters\unicode_table_armscii8.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\libmbfl\filters\unicode_table_cp850.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\libmbfl\filters\unicode_table_uhc.h
 # End Source File
 # End Group
-- 
2.50.1