summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Hirokawa <hirokawa@php.net>2011-08-27 00:08:02 +0000
committerRui Hirokawa <hirokawa@php.net>2011-08-27 00:08:02 +0000
commitd19bfc5d828e995a3b7c9d7d4183a7e645ca176b (patch)
tree6f088c166a02d90161a5597f03534448f2500784
parentda2839f71d7c7a128fc697d9d6bf703dacf20380 (diff)
downloadphp-git-d19bfc5d828e995a3b7c9d7d4183a7e645ca176b.tar.gz
MFH: update pua conversion tables.
-rw-r--r--ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h5
-rw-r--r--ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
index b230de528c..34de0e9099 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
@@ -47,6 +47,11 @@ extern const struct mbfl_convert_vtbl vtbl_wchar_sjis_kddi;
extern const struct mbfl_convert_vtbl vtbl_sjis_sb_wchar;
extern const struct mbfl_convert_vtbl vtbl_wchar_sjis_sb;
+extern const unsigned short mbfl_docomo2uni_pua[4][3];
+extern const unsigned short mbfl_kddi2uni_pua[6][3];
+extern const unsigned short mbfl_sb2uni_pua[6][3];
+extern const unsigned short mbfl_kddi2uni_pua_b[8][3];
+
int mbfl_filt_conv_sjis_mobile_wchar(int c, mbfl_convert_filter *filter);
int mbfl_filt_conv_wchar_sjis_mobile(int c, mbfl_convert_filter *filter);
int mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter);
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
index be0e6b080f..370a645942 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
@@ -37,10 +37,6 @@
#include "mbfilter_sjis_mobile.h"
extern int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter);
-extern const int mbfl_docomo2uni_pua[4][3];
-extern const int mbfl_kddi2uni_pua[6][3];
-extern const int mbfl_sb2uni_pua[6][3];
-extern const int mbfl_kddi2uni_pua_b[8][3];
extern const unsigned char mblen_table_utf8[];