moriyoshi Thu Apr 16 02:05:00 2009 UTC
Modified files:
/php-src/ext/mbstring config.m4 mbstring.dsp
/php-src/ext/mbstring/libmbfl/mbfl mbfl_consts.h mbfl_convert.c
mbfl_encoding.c mbfl_encoding.h
mbfl_ident.c
Log:
- MFB (fixes build)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.70&r2=1.71&diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.70 php-src/ext/mbstring/config.m4:1.71
--- php-src/ext/mbstring/config.m4:1.70 Thu Jul 24 12:58:37 2008
+++ php-src/ext/mbstring/config.m4 Thu Apr 16 02:05:00 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.70 2008/07/24 12:58:37 moriyoshi Exp $
+dnl $Id: config.m4,v 1.71 2009/04/16 02:05:00 moriyoshi Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -268,6 +268,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.dsp?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/mbstring/mbstring.dsp
diff -u php-src/ext/mbstring/mbstring.dsp:1.22
php-src/ext/mbstring/mbstring.dsp:1.23
--- php-src/ext/mbstring/mbstring.dsp:1.22 Wed Mar 18 17:34:02 2009
+++ php-src/ext/mbstring/mbstring.dsp Thu Apr 16 02:05:00 2009
@@ -374,6 +374,10 @@
# 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 @@
# 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 @@
# 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
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h:1.4
php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h:1.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h:1.4 Tue Feb 24 13:18:40 2009
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h Thu Apr 16 02:05:00 2009
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.9
php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.10
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.9 Thu Jul 31
17:36:35 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c Thu Apr 16 02:05:00 2009
@@ -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 @@
&vtbl_wchar_byte2le,
&vtbl_armscii8_wchar,
&vtbl_wchar_armscii8,
+ &vtbl_cp850_wchar,
+ &vtbl_wchar_cp850,
&vtbl_pass,
NULL
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.9
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.10
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.9 Thu Dec 21
17:37:53 2006
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c Thu Apr 16 02:05:00 2009
@@ -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 @@
&mbfl_encoding_cp866,
&mbfl_encoding_koi8r,
&mbfl_encoding_armscii8,
+ &mbfl_encoding_cp850,
NULL
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.6
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.7
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.6 Thu Dec 21
17:37:53 2006
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h Thu Apr 16 02:05:00 2009
@@ -101,6 +101,7 @@
mbfl_no_encoding_koi8r,
mbfl_no_encoding_8859_16,
mbfl_no_encoding_armscii8,
+ mbfl_no_encoding_cp850,
mbfl_no_encoding_charset_max
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.4
php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.4 Thu Dec 21 17:37:53 2006
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c Thu Apr 16 02:05:00 2009
@@ -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 @@
&vtbl_identify_8859_14,
&vtbl_identify_8859_15,
&vtbl_identify_armscii8,
+ &vtbl_identify_cp850,
&vtbl_identify_false,
NULL
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
