cvs: php4(PHP_4_0_7) /ext/mbstring mbfilter.c mbfilter.h mbstring.c

rasmus Fri Sep 7 02:44:21 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/mbstring mbfilter.c mbfilter.h mbstring.c Log: MFH Index: php4/ext/mbstring/mbfilter.c diff -u php4/ext/mbstring/mbfilter.c:1.12.2.2 php4/ext/mbstring/mbfilter.c:1.12.2.3 --- php4/ext/mbstring/mbfilter.c:1.12.2.2 Wed Aug 29 07:33:06 2001 +++ php4/ext/mbstring/mbfilter.c Fri Sep 7 02:44:21 2001 @@ -79,7 +79,7 @@ * */ -/* $Id: mbfilter.c,v 1.12.2.2 2001/08/29 11:33:06 wez Exp $ */ +/* $Id: mbfilter.c,v 1.12.2.3 2001/09/07 06:44:21 rasmus Exp $ */ #include <stdlib.h> Index: php4/ext/mbstring/mbfilter.h diff -u php4/ext/mbstring/mbfilter.h:1.5 php4/ext/mbstring/mbfilter.h:1.5.2.1 --- php4/ext/mbstring/mbfilter.h:1.5 Sat May 12 19:42:09 2001 +++ php4/ext/mbstring/mbfilter.h Fri Sep 7 02:44:21 2001 @@ -1,4 +1,6 @@ -/* charset=UTF-8 */ +/* charset=UTF-8 + * vim: encoding=utf-8: + * */ /* * "streamable kanji code filter and converter" @@ -84,7 +86,7 @@ * */ -/* $Id: mbfilter.h,v 1.5 2001/05/12 23:42:09 wez Exp $ */ +/* $Id: mbfilter.h,v 1.5.2.1 2001/09/07 06:44:21 rasmus Exp $ */ #ifndef MBFL_MBFILTER_H @@ -151,6 +153,7 @@ mbfl_no_encoding_sjis_mac, mbfl_no_encoding_jis, mbfl_no_encoding_2022jp, + mbfl_no_encoding_cp1252, mbfl_no_encoding_8859_1, mbfl_no_encoding_8859_2, mbfl_no_encoding_8859_3, @@ -230,7 +233,6 @@ #define MBFL_WCSPLANE_8859_15 0x70f00000 /* 00h - FFh */ #define MBFL_WCSPLANE_KSC5601 0x70f10000 /* 2121h - 7E7Eh */ #define MBFL_WCSPLANE_GB2312 0x70f20000 /* 2121h - 7E7Eh */ - #define MBFL_WCSGROUP_MASK 0xffffff #define MBFL_WCSGROUP_UCS4MAX 0x70000000 #define MBFL_WCSGROUP_WCHARMAX 0x78000000 Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.28 php4/ext/mbstring/mbstring.c:1.28.2.1 --- php4/ext/mbstring/mbstring.c:1.28 Tue Jul 31 01:56:22 2001 +++ php4/ext/mbstring/mbstring.c Fri Sep 7 02:44:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.28 2001/07/31 05:56:22 zeev Exp $ */ +/* $Id: mbstring.c,v 1.28.2.1 2001/09/07 06:44:21 rasmus Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -921,7 +921,7 @@ } -#if !defined(COMPILE_DL_MBSTRING) +#if defined(MBSTR_ENC_TRANS) SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler) { MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;