php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFB (fixes build)

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2009-04-16 02:05:00 +00:00
parent 8e82469db1
commit 7f5d554cde
7 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/mbstring/config.m4
+1
View File
@@ -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
ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+4 -1
View File
@@ -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
ext/mbstring/libmbfl/mbfl/mbfl_convert.c
+3
View File
@@ -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
};
ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+2
View File
@@ -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
};
ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+1
View File
@@ -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
};
ext/mbstring/libmbfl/mbfl/mbfl_ident.c
+2
View File
@@ -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
};
ext/mbstring/mbstring.dsp
+12
View File
@@ -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