cvs: php4(PHP_4_2_0) /ext/mbstring mbfilter.c mbfilter_ja.c

hirokawa Sat Mar 30 19:29:52 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/mbstring mbfilter.c mbfilter_ja.c Log: revert Sascha's patch to fix compile error in Tru64. Index: php4/ext/mbstring/mbfilter.c diff -u php4/ext/mbstring/mbfilter.c:1.18 php4/ext/mbstring/mbfilter.c:1.18.2.1 --- php4/ext/mbstring/mbfilter.c:1.18 Fri Feb 22 19:00:15 2002 +++ php4/ext/mbstring/mbfilter.c Sat Mar 30 19:29:51 2002 @@ -79,7 +79,7 @@ * */ -/* $Id: mbfilter.c,v 1.18 2002/02/23 00:00:15 hirokawa Exp $ */ +/* $Id: mbfilter.c,v 1.18.2.1 2002/03/31 00:29:51 hirokawa Exp $ */ #include "php.h" @@ -102,19 +102,19 @@ #define mbfl_pfree free /* unicode table */ -static const unsigned short cp1252_ucs_table[]; -static const unsigned short iso8859_2_ucs_table[]; -static const unsigned short iso8859_3_ucs_table[]; -static const unsigned short iso8859_4_ucs_table[]; -static const unsigned short iso8859_5_ucs_table[]; -static const unsigned short iso8859_6_ucs_table[]; -static const unsigned short iso8859_7_ucs_table[]; -static const unsigned short iso8859_8_ucs_table[]; -static const unsigned short iso8859_9_ucs_table[]; -static const unsigned short iso8859_10_ucs_table[]; -static const unsigned short iso8859_13_ucs_table[]; -static const unsigned short iso8859_14_ucs_table[]; -static const unsigned short iso8859_15_ucs_table[]; +extern const unsigned short cp1252_ucs_table[]; +extern const unsigned short iso8859_2_ucs_table[]; +extern const unsigned short iso8859_3_ucs_table[]; +extern const unsigned short iso8859_4_ucs_table[]; +extern const unsigned short iso8859_5_ucs_table[]; +extern const unsigned short iso8859_6_ucs_table[]; +extern const unsigned short iso8859_7_ucs_table[]; +extern const unsigned short iso8859_8_ucs_table[]; +extern const unsigned short iso8859_9_ucs_table[]; +extern const unsigned short iso8859_10_ucs_table[]; +extern const unsigned short iso8859_13_ucs_table[]; +extern const unsigned short iso8859_14_ucs_table[]; +extern const unsigned short iso8859_15_ucs_table[]; /* charactor property table */ #define MBFL_CHP_CTL 0x01 @@ -124,7 +124,7 @@ #define MBFL_CHP_MMHQENC 0x10 /* must Q-encoding in MIME Header encoded-word */ #define MBFL_CHP_MSPECIAL 0x20 /* RFC822 Special characters */ -static const unsigned char mbfl_charprop_table[]; +extern const unsigned char mbfl_charprop_table[]; /* language structure */ Index: php4/ext/mbstring/mbfilter_ja.c diff -u php4/ext/mbstring/mbfilter_ja.c:1.3 php4/ext/mbstring/mbfilter_ja.c:1.3.2.1 --- php4/ext/mbstring/mbfilter_ja.c:1.3 Mon Dec 3 10:32:12 2001 +++ php4/ext/mbstring/mbfilter_ja.c Sat Mar 30 19:29:51 2002 @@ -77,41 +77,41 @@ * */ -/* $Id: mbfilter_ja.c,v 1.3 2001/12/03 15:32:12 sas Exp $ */ +/* $Id: mbfilter_ja.c,v 1.3.2.1 2002/03/31 00:29:51 hirokawa Exp $ */ #include "mbfilter.h" #include "mbfilter_ja.h" /* cp932 table */ -static const unsigned short cp932ext3_eucjp_table[]; -static const int cp932ext3_eucjp_table_size; +extern const unsigned short cp932ext3_eucjp_table[]; +extern const int cp932ext3_eucjp_table_size; /* unicode table */ -static const unsigned short jisx0208_ucs_table[]; -static const unsigned short jisx0212_ucs_table[]; -static const unsigned short cp932ext1_ucs_table[]; -static const unsigned short cp932ext2_ucs_table[]; -static const unsigned short cp932ext3_ucs_table[]; -static const unsigned short ucs_a1_jis_table[]; -static const unsigned short ucs_a2_jis_table[]; -static const unsigned short ucs_i_jis_table[]; -static const unsigned short ucs_r_jis_table[]; -static const int jisx0208_ucs_table_size; -static const int jisx0212_ucs_table_size; -static const int cp932ext1_ucs_table_min; -static const int cp932ext1_ucs_table_max; -static const int cp932ext2_ucs_table_min; -static const int cp932ext2_ucs_table_max; -static const int cp932ext3_ucs_table_min; -static const int cp932ext3_ucs_table_max; -static const int ucs_a1_jis_table_min; -static const int ucs_a1_jis_table_max; -static const int ucs_a2_jis_table_min; -static const int ucs_a2_jis_table_max; -static const int ucs_i_jis_table_min; -static const int ucs_i_jis_table_max; -static const int ucs_r_jis_table_min; -static const int ucs_r_jis_table_max; +extern const unsigned short jisx0208_ucs_table[]; +extern const unsigned short jisx0212_ucs_table[]; +extern const unsigned short cp932ext1_ucs_table[]; +extern const unsigned short cp932ext2_ucs_table[]; +extern const unsigned short cp932ext3_ucs_table[]; +extern const unsigned short ucs_a1_jis_table[]; +extern const unsigned short ucs_a2_jis_table[]; +extern const unsigned short ucs_i_jis_table[]; +extern const unsigned short ucs_r_jis_table[]; +extern const int jisx0208_ucs_table_size; +extern const int jisx0212_ucs_table_size; +extern const int cp932ext1_ucs_table_min; +extern const int cp932ext1_ucs_table_max; +extern const int cp932ext2_ucs_table_min; +extern const int cp932ext2_ucs_table_max; +extern const int cp932ext3_ucs_table_min; +extern const int cp932ext3_ucs_table_max; +extern const int ucs_a1_jis_table_min; +extern const int ucs_a1_jis_table_max; +extern const int ucs_a2_jis_table_min; +extern const int ucs_a2_jis_table_max; +extern const int ucs_i_jis_table_min; +extern const int ucs_i_jis_table_max; +extern const int ucs_r_jis_table_min; +extern const int ucs_r_jis_table_max; #define CK(statement) do { if ((statement) < 0) return (-1); } while (0)