From: Rui Hirokawa Date: Sun, 31 Mar 2002 00:29:51 +0000 (+0000) Subject: revert Sascha's patch to fix compile error in Tru64. X-Git-Tag: php-4.2.0RC2~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83fa61ef7bf37a76b1f3cdd9fccf05e37be93676;p=php revert Sascha's patch to fix compile error in Tru64. --- diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c index dcfd6b00ef..bf21491cbd 100644 --- a/ext/mbstring/mbfilter.c +++ b/ext/mbstring/mbfilter.c @@ -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 @@ static const unsigned short iso8859_15_ucs_table[]; #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 */ diff --git a/ext/mbstring/mbfilter_ja.c b/ext/mbstring/mbfilter_ja.c index 7b2e2a84f0..aad415b0de 100644 --- a/ext/mbstring/mbfilter_ja.c +++ b/ext/mbstring/mbfilter_ja.c @@ -83,35 +83,35 @@ #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)