--- embedaddon/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h	2012/02/21 23:47:57	1.1.1.1
+++ embedaddon/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h	2012/05/29 12:34:40	1.1.1.2
@@ -42,7 +42,8 @@
 #define MBFL_ENCTYPE_MWC4BE		0x00000400
 #define MBFL_ENCTYPE_MWC4LE		0x00000800
 #define MBFL_ENCTYPE_SHFTCODE	0x00001000 
-#define MBFL_ENCTYPE_HTML_ENT       0x00002000
+#define MBFL_ENCTYPE_ENC_STRM	0x00002000
+#define MBFL_ENCTYPE_GL_UNSAFE	0x00004000
 
 /* wchar plane, special charactor */
 #define MBFL_WCSPLANE_MASK			0xffff
@@ -50,6 +51,7 @@
 #define MBFL_WCSPLANE_UTF32MAX		0x00110000
 #define MBFL_WCSPLANE_SUPMIN		0x00010000
 #define MBFL_WCSPLANE_SUPMAX		0x00200000
+#define MBFL_WCSPLANE_JIS0213		0x70e00000		/* JIS HEX : 2121h - 7E7Eh */
 #define MBFL_WCSPLANE_JIS0208		0x70e10000		/* JIS HEX : 2121h - 7E7Eh */
 #define MBFL_WCSPLANE_JIS0212		0x70e20000		/* JIS HEX : 2121h - 7E7Eh */
 #define MBFL_WCSPLANE_WINCP932		0x70e30000		/* JIS HEX : 2121h - 9898h */
@@ -80,6 +82,7 @@
 #define MBFL_WCSPLANE_KOI8U 		0x70fc0000
 #define MBFL_WCSPLANE_CP1254	        0x70fd0000              /*  00h - FFh */
 #define MBFL_WCSPLANE_CP850	        0x70fe0000              /*  00h - FFh */
+#define MBFL_WCSPLANE_GB18030		0x70ff0000		/* a1a1h-e3329a35h  */
 #define MBFL_WCSGROUP_MASK                0xffffff
 #define MBFL_WCSGROUP_UCS4MAX		0x70000000
 #define MBFL_WCSGROUP_WCHARMAX		0x78000000