diff options
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/conf_to_src.c | 16 | ||||
| -rw-r--r-- | strings/ctype-big5.c | 38 | ||||
| -rw-r--r-- | strings/ctype-bin.c | 8 | ||||
| -rw-r--r-- | strings/ctype-cp932.c | 50 | ||||
| -rw-r--r-- | strings/ctype-czech.c | 34 | ||||
| -rw-r--r-- | strings/ctype-euc_kr.c | 38 | ||||
| -rw-r--r-- | strings/ctype-eucjpms.c | 536 | ||||
| -rw-r--r-- | strings/ctype-extra.c | 568 | ||||
| -rw-r--r-- | strings/ctype-gb2312.c | 38 | ||||
| -rw-r--r-- | strings/ctype-gbk.c | 35 | ||||
| -rw-r--r-- | strings/ctype-latin1.c | 36 | ||||
| -rw-r--r-- | strings/ctype-mb.c | 40 | ||||
| -rw-r--r-- | strings/ctype-simple.c | 44 | ||||
| -rw-r--r-- | strings/ctype-sjis.c | 36 | ||||
| -rw-r--r-- | strings/ctype-tis620.c | 22 | ||||
| -rw-r--r-- | strings/ctype-uca.c | 284 | ||||
| -rw-r--r-- | strings/ctype-ucs2.c | 26 | ||||
| -rw-r--r-- | strings/ctype-ujis.c | 508 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 62 | ||||
| -rw-r--r-- | strings/ctype-win1250ch.c | 28 | ||||
| -rw-r--r-- | strings/ctype.c | 23 | ||||
| -rw-r--r-- | strings/int2str.c | 6 |
22 files changed, 1242 insertions, 1234 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index aa40a269848..0f1644b27e8 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -23,15 +23,15 @@ #define ROW16_LEN 8 #define MAX_BUF 64*1024 -static CHARSET_INFO all_charsets[256]; +static struct charset_info_st all_charsets[256]; void -print_array(FILE *f, const char *set, const char *name, uchar *a, int n) +print_array(FILE *f, const char *set, const char *name, const uchar *a, int n) { int i; - fprintf(f,"uchar %s_%s[] = {\n", name, set); + fprintf(f,"static const uchar %s_%s[] = {\n", name, set); for (i=0 ;i<n ; i++) { @@ -44,11 +44,11 @@ print_array(FILE *f, const char *set, const char *name, uchar *a, int n) void -print_array16(FILE *f, const char *set, const char *name, uint16 *a, int n) +print_array16(FILE *f, const char *set, const char *name, const uint16 *a, int n) { int i; - fprintf(f,"uint16 %s_%s[] = {\n", name, set); + fprintf(f,"static const uint16 %s_%s[] = {\n", name, set); for (i=0 ;i<n ; i++) { @@ -80,7 +80,7 @@ char *mdup(const char *src, uint len) return dst; } -static void simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from) +static void simple_cs_copy_data(struct charset_info_st *to, CHARSET_INFO *from) { to->number= from->number ? from->number : to->number; to->state|= from->state; @@ -122,7 +122,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs) (cs->sort_order || (cs->state & MY_CS_BINSORT)))); } -static int add_collation(CHARSET_INFO *cs) +static int add_collation(struct charset_info_st *cs) { if (cs->name && (cs->number || (cs->number=get_charset_number(cs->name)))) { @@ -329,7 +329,7 @@ main(int argc, char **argv __attribute__((unused))) } } - fprintf(f,"CHARSET_INFO compiled_charsets[] = {\n"); + fprintf(f,"struct charset_info_st compiled_charsets[] = {\n"); for (cs=all_charsets; cs < all_charsets+256; cs++) { if (simple_cs_is_full(cs)) diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 3da307b82fc..4c29886d307 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -47,7 +47,7 @@ #define big5head(e) ((uchar)(e>>8)) #define big5tail(e) ((uchar)(e&0xff)) -static uchar NEAR ctype_big5[257] = +static const uchar NEAR ctype_big5[257] = { 0, /* For standard library */ 32,32,32,32,32,32,32,32,32,40,40,40,40,40,32,32, @@ -68,7 +68,7 @@ static uchar NEAR ctype_big5[257] = 3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0, }; -static uchar NEAR to_lower_big5[]= +static const uchar NEAR to_lower_big5[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -104,7 +104,7 @@ static uchar NEAR to_lower_big5[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR to_upper_big5[]= +static const uchar NEAR to_upper_big5[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -140,7 +140,7 @@ static uchar NEAR to_upper_big5[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR sort_order_big5[]= +static const uchar NEAR sort_order_big5[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -471,7 +471,7 @@ static uint mbcharlen_big5(CHARSET_INFO *cs __attribute__((unused)), uint c) /* page 0 0xA140-0xC7FC */ -static uint16 tab_big5_uni0[]={ +static const uint16 tab_big5_uni0[]={ 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2022,0xFF1B,0xFF1A, 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52, 0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31, @@ -1714,7 +1714,7 @@ static uint16 tab_big5_uni0[]={ 0x2479,0x247A,0x247B,0x247C,0x247D}; /* page 1 0xC940-0xF9DC */ -static uint16 tab_big5_uni1[]={ +static const uint16 tab_big5_uni1[]={ 0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47, 0x4E8D,0x56D7,0xFA0C,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E, 0x4E2E,0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C, @@ -3282,7 +3282,7 @@ static int func_big5_uni_onechar(int code){ /* page 0 0x00A2-0x00F7 */ -static uint16 tab_uni_big50[]={ +static const uint16 tab_uni_big50[]={ 0xA246,0xA247, 0,0xA244, 0,0xA1B1, 0, 0, 0, 0, 0, 0, 0, 0,0xA258,0xA1D3, 0, 0, 0, 0, 0,0xA150, 0, 0, @@ -3296,7 +3296,7 @@ static uint16 tab_uni_big50[]={ 0, 0, 0, 0, 0,0xA1D2}; /* page 1 0x02C7-0x0451 */ -static uint16 tab_uni_big51[]={ +static const uint16 tab_uni_big51[]={ 0xA3BE, 0,0xA3BC,0xA3BD,0xA3BF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0xA3BB, 0, 0, 0, 0, 0, @@ -3349,7 +3349,7 @@ static uint16 tab_uni_big51[]={ 0xC7E8, 0,0xC7CE}; /* page 2 0x2013-0x22BF */ -static uint16 tab_uni_big52[]={ +static const uint16 tab_uni_big52[]={ 0xA156,0xA158, 0, 0, 0,0xA1A5,0xA1A6, 0, 0,0xA1A7,0xA1A8, 0, 0, 0, 0,0xA145, 0, 0,0xA14C,0xA14B, 0, 0, 0, 0, @@ -3438,7 +3438,7 @@ static uint16 tab_uni_big52[]={ 0, 0, 0, 0,0xA1E9}; /* page 3 0x2460-0x2642 */ -static uint16 tab_uni_big53[]={ +static const uint16 tab_uni_big53[]={ 0xC7E9,0xC7EA,0xC7EB,0xC7EC,0xC7ED,0xC7EE,0xC7EF,0xC7F0, 0xC7F1,0xC7F2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0xC7F3,0xC7F4,0xC7F5,0xC7F6, @@ -3502,7 +3502,7 @@ static uint16 tab_uni_big53[]={ 0xA1F0,0xA1F2,0xA1F1}; /* page 4 0x3000-0x3129 */ -static uint16 tab_uni_big54[]={ +static const uint16 tab_uni_big54[]={ 0xA140,0xA142,0xA143,0xA1B2, 0,0xC6A4, 0, 0, 0xA171,0xA172,0xA16D,0xA16E,0xA175,0xA176,0xA179,0xA17A, 0xA169,0xA16A,0xA245, 0,0xA165,0xA166, 0, 0, @@ -3543,11 +3543,11 @@ static uint16 tab_uni_big54[]={ 0xA3B9,0xA3BA}; /* page 5 0x32A3-0x32A3 */ -static uint16 tab_uni_big55[]={ +static const uint16 tab_uni_big55[]={ 0xA1C0}; /* page 6 0x338E-0x33D5 */ -static uint16 tab_uni_big56[]={ +static const uint16 tab_uni_big56[]={ 0xA255,0xA256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0xA250,0xA251, 0xA252, 0, 0,0xA254, 0, 0, 0, 0, @@ -3560,7 +3560,7 @@ static uint16 tab_uni_big56[]={ }; /* page 7 0x4E00-0x9483 */ -static uint16 tab_uni_big57[]={ +static const uint16 tab_uni_big57[]={ 0xA440,0xA442, 0,0xA443, 0, 0, 0,0xC945, 0xA456,0xA454,0xA457,0xA455,0xC946,0xA4A3,0xC94F,0xC94D, 0xA4A2,0xA4A1, 0, 0,0xA542,0xA541,0xA540, 0, @@ -5820,7 +5820,7 @@ static uint16 tab_uni_big57[]={ 0xF9C0,0xF9C1,0xF9BF,0xF9C9}; /* page 8 0x9577-0x9FA4 */ -static uint16 tab_uni_big58[]={ +static const uint16 tab_uni_big58[]={ 0xAAF8, 0, 0,0xD844,0xDC78,0xE8A5,0xF376, 0, 0,0xAAF9, 0,0xADAC,0xB07B, 0, 0,0xD845, 0,0xD846,0xB3AC, 0,0xB67D,0xDC7A,0xDC79,0xB6A3, @@ -6149,11 +6149,11 @@ static uint16 tab_uni_big58[]={ 0,0xEFB6, 0,0xF7CF, 0,0xF9A1}; /* page 9 0xFA0C-0xFA0D */ -static uint16 tab_uni_big59[]={ +static const uint16 tab_uni_big59[]={ 0xC94A,0xDDFC}; /* page 10 0xFE30-0xFFFD */ -static uint16 tab_uni_big510[]={ +static const uint16 tab_uni_big510[]={ 0xA14A,0xA157, 0,0xA159,0xA15B,0xA15F,0xA160,0xA163, 0xA164,0xA167,0xA168,0xA16B,0xA16C,0xA16F,0xA170,0xA173, 0xA174,0xA177,0xA178,0xA17B,0xA17C, 0, 0, 0, @@ -6377,7 +6377,7 @@ static MY_CHARSET_HANDLER my_charset_big5_handler= my_scan_8bit }; -CHARSET_INFO my_charset_big5_chinese_ci= +struct charset_info_st my_charset_big5_chinese_ci= { 1,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ @@ -6410,7 +6410,7 @@ CHARSET_INFO my_charset_big5_chinese_ci= }; -CHARSET_INFO my_charset_big5_bin= +struct charset_info_st my_charset_big5_bin= { 84,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 95d97af2bfb..95544cdf42b 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -22,7 +22,7 @@ #include "m_string.h" #include "m_ctype.h" -static uchar ctype_bin[]= +static const uchar ctype_bin[]= { 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, @@ -46,7 +46,7 @@ static uchar ctype_bin[]= /* Dummy array for toupper / tolower / sortorder */ -static uchar bin_char_array[] = +static const uchar bin_char_array[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -68,7 +68,7 @@ static uchar bin_char_array[] = static my_bool -my_coll_init_8bit_bin(CHARSET_INFO *cs, +my_coll_init_8bit_bin(struct charset_info_st *cs, void *(*alloc)(size_t) __attribute__((unused))) { cs->max_sort_char=255; @@ -549,7 +549,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_bin = +struct charset_info_st my_charset_bin = { 63,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PRIMARY,/* state */ diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index 07191c436b7..2caffe7aea2 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -31,7 +31,7 @@ * .configure. mbmaxlen_cp932=2 */ -static uchar NEAR ctype_cp932[257] = +static const uchar NEAR ctype_cp932[257] = { 0, /* For standard library */ 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ @@ -68,7 +68,7 @@ static uchar NEAR ctype_cp932[257] = 0020, 0020, 0020, 0020, 0020, 0000, 0000, 0000 }; -static uchar NEAR to_lower_cp932[]= +static const uchar NEAR to_lower_cp932[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -104,7 +104,7 @@ static uchar NEAR to_lower_cp932[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR to_upper_cp932[]= +static const uchar NEAR to_upper_cp932[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -140,7 +140,7 @@ static uchar NEAR to_upper_cp932[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR sort_order_cp932[]= +static const uchar NEAR sort_order_cp932[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -377,7 +377,7 @@ static my_bool my_like_range_cp932(CHARSET_INFO *cs __attribute__((unused)), } /* page 0 0x00A1-0x00DF */ -static uint16 tab_cp932_uni0[]={ +static const uint16 tab_cp932_uni0[]={ 0xFF61,0xFF62,0xFF63,0xFF64,0xFF65,0xFF66,0xFF67,0xFF68, 0xFF69,0xFF6A,0xFF6B,0xFF6C,0xFF6D,0xFF6E,0xFF6F,0xFF70, 0xFF71,0xFF72,0xFF73,0xFF74,0xFF75,0xFF76,0xFF77,0xFF78, @@ -388,7 +388,7 @@ static uint16 tab_cp932_uni0[]={ 0xFF99,0xFF9A,0xFF9B,0xFF9C,0xFF9D,0xFF9E,0xFF9F}; /* page 1 0x8140-0x84BE */ -static uint16 tab_cp932_uni1[]={ +static const uint16 tab_cp932_uni1[]={ 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, @@ -503,7 +503,7 @@ static uint16 tab_cp932_uni1[]={ 0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,0x2542}; /* page 2 0x8740-0x879C - NEC Row 13 */ -static uint16 tab_cp932_uni2[]={ +static const uint16 tab_cp932_uni2[]={ 0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467, 0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F, 0x2470,0x2471,0x2472,0x2473,0x2160,0x2161,0x2162,0x2163, @@ -518,7 +518,7 @@ static uint16 tab_cp932_uni2[]={ 0x221F,0x22BF,0x2235,0x2229,0x222A}; /* page 3 0x889F-0x9FFC */ -static uint16 tab_cp932_uni3[]={ +static const uint16 tab_cp932_uni3[]={ 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, @@ -1269,7 +1269,7 @@ static uint16 tab_cp932_uni3[]={ 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; /* page 4 0xE040-0xEAA4 */ -static uint16 tab_cp932_uni4[]={ +static const uint16 tab_cp932_uni4[]={ 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, @@ -1606,7 +1606,7 @@ static uint16 tab_cp932_uni4[]={ /* page 5 0xED40-0xEEFC - IBM Selected Kanji and Non-Kanji(NEC implementation) */ -static uint16 tab_cp932_uni5[]={ +static const uint16 tab_cp932_uni5[]={ 0x7E8A,0x891C,0x9348,0x9288,0x84DC,0x4FC9,0x70BB,0x6631, 0x68C8,0x92F9,0x66FB,0x5F45,0x4E28,0x4EE1,0x4EFC,0x4F00, 0x4F03,0x4F39,0x4F56,0x4F92,0x4F8A,0x4F9A,0x4F94,0x4FCD, @@ -1665,7 +1665,7 @@ static uint16 tab_cp932_uni5[]={ 0x2179,0xFFE2,0xFFE4,0xFF07,0xFF02}; /* page 6 0xF040-0xF9FC - User defined characters */ -static uint16 tab_cp932_uni6[]={ +static const uint16 tab_cp932_uni6[]={ 0xE000,0xE001,0xE002,0xE003,0xE004,0xE005,0xE006,0xE007, 0xE008,0xE009,0xE00A,0xE00B,0xE00C,0xE00D,0xE00E,0xE00F, 0xE010,0xE011,0xE012,0xE013,0xE014,0xE015,0xE016,0xE017, @@ -1981,7 +1981,7 @@ static uint16 tab_cp932_uni6[]={ /* page 7 0xFA40-0xFC4B - IBM Selected Kanji and Non-Kanji */ -static uint16 tab_cp932_uni7[]={ +static const uint16 tab_cp932_uni7[]={ 0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177, 0x2178,0x2179,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165, 0x2166,0x2167,0x2168,0x2169,0xFFE2,0xFFE4,0xFF07,0xFF02, @@ -2070,7 +2070,7 @@ static int func_cp932_uni_onechar(int code){ } /* page 0 0x005C-0x00F7 */ -static uint16 tab_uni_cp9320[]={ +static const uint16 tab_uni_cp9320[]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2093,7 +2093,7 @@ static uint16 tab_uni_cp9320[]={ 0, 0, 0,0x8180}; /* page 1 0x0391-0x0451 */ -static uint16 tab_uni_cp9321[]={ +static const uint16 tab_uni_cp9321[]={ 0x839F,0x83A0,0x83A1,0x83A2,0x83A3,0x83A4,0x83A5,0x83A6, 0x83A7,0x83A8,0x83A9,0x83AA,0x83AB,0x83AC,0x83AD,0x83AE, 0x83AF, 0,0x83B0,0x83B1,0x83B2,0x83B3,0x83B4,0x83B5, @@ -2121,7 +2121,7 @@ static uint16 tab_uni_cp9321[]={ 0x8476}; /* page 2 0x2010-0x2473 */ -static uint16 tab_uni_cp9322[]={ +static const uint16 tab_uni_cp9322[]={ 0x815D, 0, 0, 0, 0,0x815C, 0, 0, 0x8165,0x8166, 0, 0,0x8167,0x8168, 0, 0, 0x81F5,0x81F6, 0, 0, 0,0x8164,0x8163, 0, @@ -2265,7 +2265,7 @@ static uint16 tab_uni_cp9322[]={ 0x8750,0x8751,0x8752,0x8753}; /* page 3 0x2500-0x266F */ -static uint16 tab_uni_cp9323[]={ +static const uint16 tab_uni_cp9323[]={ 0x849F,0x84AA,0x84A0,0x84AB, 0, 0, 0, 0, 0, 0, 0, 0,0x84A1, 0, 0,0x84AC, 0x84A2, 0, 0,0x84AD,0x84A4, 0, 0,0x84AF, @@ -2315,7 +2315,7 @@ static uint16 tab_uni_cp9323[]={ }; /* page 4 0x3000-0x30FE */ -static uint16 tab_uni_cp9324[]={ +static const uint16 tab_uni_cp9324[]={ 0x8140,0x8141,0x8142,0x8156, 0,0x8158,0x8159,0x815A, 0x8171,0x8172,0x8173,0x8174,0x8175,0x8176,0x8177,0x8178, 0x8179,0x817A,0x81A7,0x81AC,0x816B,0x816C, 0, 0, @@ -2350,7 +2350,7 @@ static uint16 tab_uni_cp9324[]={ 0, 0, 0,0x8145,0x815B,0x8152,0x8153}; /* page 5 0x3230-0x33CD */ -static uint16 tab_uni_cp9325[]={ +static const uint16 tab_uni_cp9325[]={ 0,0x878A,0x878B, 0, 0, 0, 0, 0, 0,0x878C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2405,7 +2405,7 @@ static uint16 tab_uni_cp9325[]={ 0, 0, 0, 0, 0,0x8783}; /* page 6 0x4E00-0x9481 */ -static uint16 tab_uni_cp9326[]={ +static const uint16 tab_uni_cp9326[]={ 0x88EA,0x929A, 0,0x8EB5, 0, 0, 0,0x969C, 0x8FE4,0x8E4F,0x8FE3,0x89BA, 0,0x9573,0x975E, 0, 0x98A0,0x894E, 0, 0,0x8A8E,0x98A1,0x90A2,0x99C0, @@ -4665,7 +4665,7 @@ static uint16 tab_uni_cp9326[]={ 0,0xE876}; /* page 7 0x9577-0x9FA0 */ -static uint16 tab_uni_cp9327[]={ +static const uint16 tab_uni_cp9327[]={ 0x92B7, 0, 0, 0, 0, 0, 0, 0, 0,0x96E5, 0,0xE878,0x914D, 0, 0, 0, 0xE879, 0,0x95C2,0xE87A,0x8A4A, 0, 0, 0, @@ -4994,7 +4994,7 @@ static uint16 tab_uni_cp9327[]={ 0,0xEA9E}; /* page 8 0xE000-0xE757 - User defined characters */ -static uint16 tab_uni_cp9328[]={ +static const uint16 tab_uni_cp9328[]={ 0xF040,0xF041,0xF042,0xF043,0xF044,0xF045,0xF046,0xF047, 0xF048,0xF049,0xF04A,0xF04B,0xF04C,0xF04D,0xF04E,0xF04F, 0xF050,0xF051,0xF052,0xF053,0xF054,0xF055,0xF056,0xF057, @@ -5232,7 +5232,7 @@ static uint16 tab_uni_cp9328[]={ 0xF9F5,0xF9F6,0xF9F7,0xF9F8,0xF9F9,0xF9FA,0xF9FB,0xF9FC}; /* page 9 0xF920-0xFA2D */ -static uint16 tab_uni_cp9329[]={ +static const uint16 tab_uni_cp9329[]={ 0, 0, 0, 0, 0, 0, 0, 0, 0,0xFAE0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5269,7 +5269,7 @@ static uint16 tab_uni_cp9329[]={ 0xFBDA,0xFBEA,0xFBF6,0xFBF7,0xFBF9,0xFC49}; /* page 10 0xFF01-0xFFE5 */ -static uint16 tab_uni_cp93210[]={ +static const uint16 tab_uni_cp93210[]={ 0x8149,0xFA57,0x8194,0x8190,0x8193,0x8195,0xFA56,0x8169, 0x816A,0x8196,0x817B,0x8143,0x817C,0x8144,0x815E,0x824F, 0x8250,0x8251,0x8252,0x8253,0x8254,0x8255,0x8256,0x8257, @@ -5508,7 +5508,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_cp932_japanese_ci= +struct charset_info_st my_charset_cp932_japanese_ci= { 95,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ @@ -5540,7 +5540,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci= &my_collation_ci_handler }; -CHARSET_INFO my_charset_cp932_bin= +struct charset_info_st my_charset_cp932_bin= { 96,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c index a5df86cc6b3..2f32d3eae88 100644 --- a/strings/ctype-czech.c +++ b/strings/ctype-czech.c @@ -83,7 +83,7 @@ below for what are the "special values" */ -static uchar *CZ_SORT_TABLE[] = { +static const uchar *const CZ_SORT_TABLE[] = { (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\043\044\045\046\047\050\051\052\053\054\000\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003\000\021\000\020\032\000\000\032\032\033\042\000\042\042\000\003\000\021\000\020\032\000\000\032\032\033\042\000\042\042\027\003\003\003\003\020\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034\034\040\033\000\027\003\003\003\003\020\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034\034\040\033\000", (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\106\107\110\111\112\113\114\115\116\117\000\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\042\000\041\063\000\000\062\064\066\104\000\103\105\000\010\000\042\000\041\063\000\000\062\064\066\104\000\103\105\057\004\005\007\006\040\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074\073\101\067\000\057\004\005\007\006\040\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074\073\101\067\000", (uchar*) "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\212\213\214\215\216\217\220\221\222\223\000\000\000\000\000\000\000\004\020\377\032\040\052\054\056\063\071\073\075\105\107\115\127\131\133\141\151\157\171\173\175\177\203\000\000\000\000\000\000\003\017\377\031\037\051\053\055\062\070\072\074\104\106\114\126\130\132\140\150\156\170\172\174\176\202\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\016\000\103\000\101\145\000\000\143\147\153\207\000\205\211\000\015\000\102\000\100\144\000\000\142\146\152\206\000\204\210\135\006\010\014\012\077\026\030\024\042\050\046\044\065\067\034\036\113\111\117\121\125\123\000\137\163\161\167\165\201\155\000\134\005\007\013\011\076\025\027\023\041\047\045\043\064\066\033\035\112\110\116\120\124\122\000\136\162\160\166\164\200\154\000", @@ -99,14 +99,14 @@ static uchar *CZ_SORT_TABLE[] = { struct wordvalue { const char * word; - uchar *outvalue; + const uchar *outvalue; }; -static struct wordvalue doubles[] = { - { "ch", (uchar*) "\014\031\057\057" }, - { "Ch", (uchar*) "\014\031\060\060" }, - { "CH", (uchar*) "\014\031\061\061" }, - { "c", (uchar*) "\005\012\021\021" }, - { "C", (uchar*) "\005\012\022\022" }, +static const struct wordvalue doubles[] = { + { "ch", (const uchar*) "\014\031\057\057" }, + { "Ch", (const uchar*) "\014\031\060\060" }, + { "CH", (const uchar*) "\014\031\061\061" }, + { "c", (const uchar*) "\005\012\021\021" }, + { "C", (const uchar*) "\005\012\022\022" }, }; /* @@ -430,7 +430,7 @@ static my_bool my_like_range_czech(CHARSET_INFO *cs __attribute__((unused)), #include <my_global.h> #include "m_string.h" -static uchar NEAR ctype_czech[257] = { +static const uchar NEAR ctype_czech[257] = { 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, @@ -450,7 +450,7 @@ static uchar NEAR ctype_czech[257] = { 2, 2, 2, 2, 2, 2, 2, 16, 2, 2, 2, 2, 2, 2, 2, 16, }; -static uchar NEAR to_lower_czech[] = { +static const uchar NEAR to_lower_czech[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -469,7 +469,7 @@ static uchar NEAR to_lower_czech[] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255, }; -static uchar NEAR to_upper_czech[] = { +static const uchar NEAR to_upper_czech[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -488,7 +488,7 @@ static uchar NEAR to_upper_czech[] = { 240,209,210,211,212,213,214,247,216,217,218,219,220,221,222,255, }; -static uchar NEAR sort_order_czech[] = { +static const uchar NEAR sort_order_czech[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -507,7 +507,7 @@ static uchar NEAR sort_order_czech[] = { 255, 98, 99,101,102,103,104,255,109,119,118,120,121,126,116,255, }; -static uint16 tab_8859_2_uni[256]={ +static const uint16 tab_8859_2_uni[256]={ 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -544,7 +544,7 @@ static uint16 tab_8859_2_uni[256]={ /* 0000-00FD , 254 chars */ -static uchar tab_uni_8859_2_plane00[]={ +static const uchar tab_uni_8859_2_plane00[]={ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -563,7 +563,7 @@ static uchar tab_uni_8859_2_plane00[]={ 0x00,0x00,0x00,0xF3,0xF4,0x00,0xF6,0xF7,0x00,0x00,0xFA,0x00,0xFC,0xFD}; /* 0102-017E , 125 chars */ -static uchar tab_uni_8859_2_plane01[]={ +static const uchar tab_uni_8859_2_plane01[]={ 0xC3,0xE3,0xA1,0xB1,0xC6,0xE6,0x00,0x00,0x00,0x00,0xC8,0xE8,0xCF,0xEF,0xD0,0xF0, 0x00,0x00,0x00,0x00,0x00,0x00,0xCA,0xEA,0xCC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -574,7 +574,7 @@ static uchar tab_uni_8859_2_plane01[]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xAC,0xBC,0xAF,0xBF,0xAE,0xBE}; /* 02C7-02DD , 23 chars */ -static uchar tab_uni_8859_2_plane02[]={ +static const uchar tab_uni_8859_2_plane02[]={ 0xB7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0xA2,0xFF,0x00,0xB2,0x00,0xBD}; @@ -601,7 +601,7 @@ static MY_COLLATION_HANDLER my_collation_latin2_czech_ci_handler = my_propagate_simple }; -CHARSET_INFO my_charset_latin2_czech_ci = +struct charset_info_st my_charset_latin2_czech_ci = { 2,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_CSSORT, /* state */ diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index fc0af7e35d5..a5d5c1ee6ea 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -32,7 +32,7 @@ #ifdef HAVE_CHARSET_euckr -static uchar NEAR ctype_euc_kr[257] = +static const uchar NEAR ctype_euc_kr[257] = { 0, /* For standard library */ 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ @@ -69,7 +69,7 @@ static uchar NEAR ctype_euc_kr[257] = 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, }; -static uchar NEAR to_lower_euc_kr[]= +static const uchar NEAR to_lower_euc_kr[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -105,7 +105,7 @@ static uchar NEAR to_lower_euc_kr[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR to_upper_euc_kr[]= +static const uchar NEAR to_upper_euc_kr[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -141,7 +141,7 @@ static uchar NEAR to_upper_euc_kr[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR sort_order_euc_kr[]= +static const uchar NEAR sort_order_euc_kr[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -217,7 +217,7 @@ static uint mbcharlen_euc_kr(CHARSET_INFO *cs __attribute__((unused)),uint c) /* page 0 0x8141-0xC8FE */ -static uint16 tab_ksc5601_uni0[]={ +static const uint16 tab_ksc5601_uni0[]={ 0xAC02,0xAC03,0xAC05,0xAC06,0xAC0B,0xAC0C,0xAC0D,0xAC0E, 0xAC0F,0xAC18,0xAC1E,0xAC1F,0xAC21,0xAC22,0xAC23,0xAC25, 0xAC26,0xAC27,0xAC28,0xAC29,0xAC2A,0xAC2B,0xAC2E,0xAC32, @@ -2516,7 +2516,7 @@ static uint16 tab_ksc5601_uni0[]={ 0xD78C,0xD790,0xD798,0xD799,0xD79B,0xD79D}; /* page 1 0xCAA1-0xFDFE */ -static uint16 tab_ksc5601_uni1[]={ +static const uint16 tab_ksc5601_uni1[]={ 0x4F3D,0x4F73,0x5047,0x50F9,0x52A0,0x53EF,0x5475,0x54E5, 0x5609,0x5AC1,0x5BB6,0x6687,0x67B6,0x67B7,0x67EF,0x6B4C, 0x73C2,0x75C2,0x7A3C,0x82DB,0x8304,0x8857,0x8888,0x8A36, @@ -4170,7 +4170,7 @@ static int func_ksc5601_uni_onechar(int code){ return(0); } /* page 0 0x00A1-0x0167 */ -static uint16 tab_uni_ksc56010[]={ +static const uint16 tab_uni_ksc56010[]={ 0xA2AE, 0, 0,0xA2B4, 0, 0,0xA1D7,0xA1A7, 0,0xA8A3, 0, 0,0xA1A9,0xA2E7, 0,0xA1C6, 0xA1BE,0xA9F7,0xA9F8,0xA2A5, 0,0xA2D2,0xA1A4,0xA2AC, @@ -4198,7 +4198,7 @@ static uint16 tab_uni_ksc56010[]={ 0, 0, 0, 0, 0,0xA8AE,0xA9AE}; /* page 1 0x02C7-0x0451 */ -static uint16 tab_uni_ksc56011[]={ +static const uint16 tab_uni_ksc56011[]={ 0xA2A7, 0, 0, 0, 0, 0, 0, 0, 0,0xA2B0, 0, 0, 0, 0, 0, 0, 0,0xA2A8,0xA2AB,0xA2AA,0xA2AD, 0,0xA2A9, 0, @@ -4251,7 +4251,7 @@ static uint16 tab_uni_ksc56011[]={ 0xACF1, 0,0xACD7}; /* page 2 0x2015-0x2312 */ -static uint16 tab_uni_ksc56012[]={ +static const uint16 tab_uni_ksc56012[]={ 0xA1AA, 0, 0,0xA1AE,0xA1AF, 0, 0,0xA1B0, 0xA1B1, 0, 0,0xA2D3,0xA2D4, 0, 0, 0, 0xA1A5,0xA1A6, 0, 0, 0, 0, 0, 0, @@ -4350,7 +4350,7 @@ static uint16 tab_uni_ksc56012[]={ 0, 0, 0, 0, 0,0xA1D2}; /* page 3 0x2460-0x266D */ -static uint16 tab_uni_ksc56013[]={ +static const uint16 tab_uni_ksc56013[]={ 0xA8E7,0xA8E8,0xA8E9,0xA8EA,0xA8EB,0xA8EC,0xA8ED,0xA8EE, 0xA8EF,0xA8F0,0xA8F1,0xA8F2,0xA8F3,0xA8F4,0xA8F5, 0, 0, 0, 0, 0,0xA9E7,0xA9E8,0xA9E9,0xA9EA, @@ -4419,7 +4419,7 @@ static uint16 tab_uni_ksc56013[]={ 0xA2CD,0xA2DB,0xA2DC, 0,0xA2DD,0xA2DA}; /* page 4 0x3000-0x327F */ -static uint16 tab_uni_ksc56014[]={ +static const uint16 tab_uni_ksc56014[]={ 0xA1A1,0xA1A2,0xA1A3,0xA1A8, 0, 0, 0, 0, 0xA1B4,0xA1B5,0xA1B6,0xA1B7,0xA1B8,0xA1B9,0xA1BA,0xA1BB, 0xA1BC,0xA1BD, 0,0xA1EB,0xA1B2,0xA1B3, 0, 0, @@ -4503,7 +4503,7 @@ static uint16 tab_uni_ksc56014[]={ }; /* page 5 0x3380-0x33DD */ -static uint16 tab_uni_ksc56015[]={ +static const uint16 tab_uni_ksc56015[]={ 0xA7C9,0xA7CA,0xA7CB,0xA7CC,0xA7CD, 0, 0, 0, 0xA7BA,0xA7BB,0xA7DC,0xA7DD,0xA7DE,0xA7B6,0xA7B7,0xA7B8, 0xA7D4,0xA7D5,0xA7D6,0xA7D7,0xA7D8,0xA7A1,0xA7A2,0xA7A3, @@ -4518,7 +4518,7 @@ static uint16 tab_uni_ksc56015[]={ 0xA2E4, 0, 0,0xA7E4,0xA7EE,0xA7E9}; /* page 6 0x4E00-0x947F */ -static uint16 tab_uni_ksc56016[]={ +static const uint16 tab_uni_ksc56016[]={ 0xECE9,0xEFCB, 0,0xF6D2, 0, 0, 0,0xD8B2, 0xEDDB,0xDFB2,0xDFBE,0xF9BB, 0,0xDCF4, 0, 0, 0,0xF5E4, 0, 0,0xF3A6,0xDDE0,0xE1A6, 0, @@ -6778,7 +6778,7 @@ static uint16 tab_uni_ksc56016[]={ }; /* page 7 0x9577-0x9F9C */ -static uint16 tab_uni_ksc56017[]={ +static const uint16 tab_uni_ksc56017[]={ 0xEDFE, 0, 0, 0, 0, 0, 0, 0, 0,0xDAA6, 0, 0,0xE0EC, 0, 0, 0, 0, 0,0xF8CD, 0,0xCBD2, 0, 0, 0, @@ -7106,7 +7106,7 @@ static uint16 tab_uni_ksc56017[]={ 0, 0, 0, 0, 0,0xCFCF}; /* page 8 0xAC00-0xD7A3 */ -static uint16 tab_uni_ksc56018[]={ +static const uint16 tab_uni_ksc56018[]={ 0xB0A1,0xB0A2,0x8141,0x8142,0xB0A3,0x8143,0x8144,0xB0A4, 0xB0A5,0xB0A6,0xB0A7,0x8145,0x8146,0x8147,0x8148,0x8149, 0xB0A8,0xB0A9,0xB0AA,0xB0AB,0xB0AC,0xB0AD,0xB0AE,0xB0AF, @@ -8506,7 +8506,7 @@ static uint16 tab_uni_ksc56018[]={ 0xC64F,0xC650,0xC651,0xC652}; /* page 9 0xF900-0xFA0B */ -static uint16 tab_uni_ksc56019[]={ +static const uint16 tab_uni_ksc56019[]={ 0xCBD0,0xCBD6,0xCBE7,0xCDCF,0xCDE8,0xCEAD,0xCFFB,0xD0A2, 0xD0B8,0xD0D0,0xD0DD,0xD1D4,0xD1D5,0xD1D8,0xD1DB,0xD1DC, 0xD1DD,0xD1DE,0xD1DF,0xD1E0,0xD1E2,0xD1E3,0xD1E4,0xD1E5, @@ -8543,7 +8543,7 @@ static uint16 tab_uni_ksc56019[]={ 0xFAA1,0xFAA2,0xFAE6,0xFCA9}; /* page 10 0xFF01-0xFFE6 */ -static uint16 tab_uni_ksc560110[]={ +static const uint16 tab_uni_ksc560110[]={ 0xA3A1,0xA3A2,0xA3A3,0xA3A4,0xA3A5,0xA3A6,0xA3A7,0xA3A8, 0xA3A9,0xA3AA,0xA3AB,0xA3AC,0xA3AD,0xA3AE,0xA3AF,0xA3B0, 0xA3B1,0xA3B2,0xA3B3,0xA3B4,0xA3B5,0xA3B6,0xA3B7,0xA3B8, @@ -8737,7 +8737,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_euckr_korean_ci= +struct charset_info_st my_charset_euckr_korean_ci= { 19,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ @@ -8770,7 +8770,7 @@ CHARSET_INFO my_charset_euckr_korean_ci= }; -CHARSET_INFO my_charset_euckr_bin= +struct charset_info_st my_charset_euckr_bin= { 85,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c index b8b04dfca6b..119135c7515 100644 --- a/strings/ctype-eucjpms.c +++ b/strings/ctype-eucjpms.c @@ -33,7 +33,7 @@ ctype-ujis.c file. #ifdef HAVE_CHARSET_eucjpms -static uchar NEAR ctype_eucjpms[257] = +static const uchar NEAR ctype_eucjpms[257] = { 0, /* For standard library */ 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ @@ -70,7 +70,7 @@ static uchar NEAR ctype_eucjpms[257] = 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, }; -static uchar NEAR to_lower_eucjpms[]= +static const uchar NEAR to_lower_eucjpms[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -106,7 +106,7 @@ static uchar NEAR to_lower_eucjpms[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR to_upper_eucjpms[]= +static const uchar NEAR to_upper_eucjpms[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -142,7 +142,7 @@ static uchar NEAR to_upper_eucjpms[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR sort_order_eucjpms[]= +static const uchar NEAR sort_order_eucjpms[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -201,7 +201,7 @@ static uint mbcharlen_eucjpms(CHARSET_INFO *cs __attribute__((unused)),uint c) } -static uint16 tab_jisx0201_uni[256]={ +static const uint16 tab_jisx0201_uni[256]={ 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -270,7 +270,7 @@ my_wc_mb_jisx0201(CHARSET_INFO *cs __attribute__((unused)), /* page 0 0x2121-0x217E */ -static uint16 tab_jisx0208_uni0[]={ +static const uint16 tab_jisx0208_uni0[]={ 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, @@ -285,7 +285,7 @@ static uint16 tab_jisx0208_uni0[]={ 0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7}; /* page 1 0x2221-0x227E */ -static uint16 tab_jisx0208_uni1[]={ +static const uint16 tab_jisx0208_uni1[]={ 0x25C6,0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x203B, 0x3012,0x2192,0x2190,0x2191,0x2193,0x3013, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -300,7 +300,7 @@ static uint16 tab_jisx0208_uni1[]={ 0x00B6, 0, 0, 0, 0,0x25EF}; /* page 2 0x2330-0x237A */ -static uint16 tab_jisx0208_uni2[]={ +static const uint16 tab_jisx0208_uni2[]={ 0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17, 0xFF18,0xFF19, 0, 0, 0, 0, 0, 0, 0,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27, @@ -313,7 +313,7 @@ static uint16 tab_jisx0208_uni2[]={ 0xFF58,0xFF59,0xFF5A}; /* page 3 0x2421-0x2473 */ -static uint16 tab_jisx0208_uni3[]={ +static const uint16 tab_jisx0208_uni3[]={ 0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048, 0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050, 0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058, @@ -327,7 +327,7 @@ static uint16 tab_jisx0208_uni3[]={ 0x3091,0x3092,0x3093}; /* page 4 0x2521-0x2576 */ -static uint16 tab_jisx0208_uni4[]={ +static const uint16 tab_jisx0208_uni4[]={ 0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8, 0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0, 0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8, @@ -341,7 +341,7 @@ static uint16 tab_jisx0208_uni4[]={ 0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6}; /* page 5 0x2621-0x2658 */ -static uint16 tab_jisx0208_uni5[]={ +static const uint16 tab_jisx0208_uni5[]={ 0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398, 0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0, 0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9, @@ -352,7 +352,7 @@ static uint16 tab_jisx0208_uni5[]={ }; /* page 6 0x2721-0x2771 */ -static uint16 tab_jisx0208_uni6[]={ +static const uint16 tab_jisx0208_uni6[]={ 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416, 0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E, 0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426, @@ -366,7 +366,7 @@ static uint16 tab_jisx0208_uni6[]={ 0x044F}; /* page 7 0x2821-0x2840 */ -static uint16 tab_jisx0208_uni7[]={ +static const uint16 tab_jisx0208_uni7[]={ 0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,0x252C, 0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,0x251B, 0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,0x252F, @@ -374,7 +374,7 @@ static uint16 tab_jisx0208_uni7[]={ }; /* page 8 0x3021-0x307E */ -static uint16 tab_jisx0208_uni8[]={ +static const uint16 tab_jisx0208_uni8[]={ 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, @@ -389,7 +389,7 @@ static uint16 tab_jisx0208_uni8[]={ 0x59FB,0x5F15,0x98F2,0x6DEB,0x80E4,0x852D}; /* page 9 0x3121-0x317E */ -static uint16 tab_jisx0208_uni9[]={ +static const uint16 tab_jisx0208_uni9[]={ 0x9662,0x9670,0x96A0,0x97FB,0x540B,0x53F3,0x5B87,0x70CF, 0x7FBD,0x8FC2,0x96E8,0x536F,0x9D5C,0x7ABA,0x4E11,0x7893, 0x81FC,0x6E26,0x5618,0x5504,0x6B1D,0x851A,0x9C3B,0x59E5, @@ -404,7 +404,7 @@ static uint16 tab_jisx0208_uni9[]={ 0x7525,0x51F9,0x592E,0x5965,0x5F80,0x5FDC}; /* page 10 0x3221-0x327E */ -static uint16 tab_jisx0208_uni10[]={ +static const uint16 tab_jisx0208_uni10[]={ 0x62BC,0x65FA,0x6A2A,0x6B27,0x6BB4,0x738B,0x7FC1,0x8956, 0x9D2C,0x9D0E,0x9EC4,0x5CA1,0x6C96,0x837B,0x5104,0x5C4B, 0x61B6,0x81C6,0x6876,0x7261,0x4E59,0x4FFA,0x5378,0x6069, @@ -419,7 +419,7 @@ static uint16 tab_jisx0208_uni10[]={ 0x6094,0x6062,0x61D0,0x6212,0x62D0,0x6539}; /* page 11 0x3321-0x337E */ -static uint16 tab_jisx0208_uni11[]={ +static const uint16 tab_jisx0208_uni11[]={ 0x9B41,0x6666,0x68B0,0x6D77,0x7070,0x754C,0x7686,0x7D75, 0x82A5,0x87F9,0x958B,0x968E,0x8C9D,0x51F1,0x52BE,0x5916, 0x54B3,0x5BB3,0x5D16,0x6168,0x6982,0x6DAF,0x788D,0x84CB, @@ -434,7 +434,7 @@ static uint16 tab_jisx0208_uni11[]={ 0x938C,0x565B,0x9D28,0x6822,0x8305,0x8431}; /* page 12 0x3421-0x347E */ -static uint16 tab_jisx0208_uni12[]={ +static const uint16 tab_jisx0208_uni12[]={ 0x7CA5,0x5208,0x82C5,0x74E6,0x4E7E,0x4F83,0x51A0,0x5BD2, 0x520A,0x52D8,0x52E7,0x5DFB,0x559A,0x582A,0x59E6,0x5B8C, 0x5B98,0x5BDB,0x5E72,0x5E79,0x60A3,0x611F,0x6163,0x61BE, @@ -449,7 +449,7 @@ static uint16 tab_jisx0208_uni12[]={ 0x673A,0x65D7,0x65E2,0x671F,0x68CB,0x68C4}; /* page 13 0x3521-0x357E */ -static uint16 tab_jisx0208_uni13[]={ +static const uint16 tab_jisx0208_uni13[]={ 0x6A5F,0x5E30,0x6BC5,0x6C17,0x6C7D,0x757F,0x7948,0x5B63, 0x7A00,0x7D00,0x5FBD,0x898F,0x8A18,0x8CB4,0x8D77,0x8ECC, 0x8F1D,0x98E2,0x9A0E,0x9B3C,0x4E80,0x507D,0x5100,0x5993, @@ -464,7 +464,7 @@ static uint16 tab_jisx0208_uni13[]={ 0x6F01,0x79A6,0x9B5A,0x4EA8,0x4EAB,0x4EAC}; /* page 14 0x3621-0x367E */ -static uint16 tab_jisx0208_uni14[]={ +static const uint16 tab_jisx0208_uni14[]={ 0x4F9B,0x4FA0,0x50D1,0x5147,0x7AF6,0x5171,0x51F6,0x5354, 0x5321,0x537F,0x53EB,0x55AC,0x5883,0x5CE1,0x5F37,0x5F4A, 0x602F,0x6050,0x606D,0x631F,0x6559,0x6A4B,0x6CC1,0x72C2, @@ -479,7 +479,7 @@ static uint16 tab_jisx0208_uni14[]={ 0x9685,0x4E32,0x6ADB,0x91E7,0x5C51,0x5C48}; /* page 15 0x3721-0x377E */ -static uint16 tab_jisx0208_uni15[]={ +static const uint16 tab_jisx0208_uni15[]={ 0x6398,0x7A9F,0x6C93,0x9774,0x8F61,0x7AAA,0x718A,0x9688, 0x7C82,0x6817,0x7E70,0x6851,0x936C,0x52F2,0x541B,0x85AB, 0x8A13,0x7FA4,0x8ECD,0x90E1,0x5366,0x8888,0x7941,0x4FC2, @@ -494,7 +494,7 @@ static uint16 tab_jisx0208_uni15[]={ 0x5ACC,0x5EFA,0x61B2,0x61F8,0x62F3,0x6372}; /* page 16 0x3821-0x387E */ -static uint16 tab_jisx0208_uni16[]={ +static const uint16 tab_jisx0208_uni16[]={ 0x691C,0x6A29,0x727D,0x72AC,0x732E,0x7814,0x786F,0x7D79, 0x770C,0x80A9,0x898B,0x8B19,0x8CE2,0x8ED2,0x9063,0x9375, 0x967A,0x9855,0x9A13,0x9E78,0x5143,0x539F,0x53B3,0x5E7B, @@ -509,7 +509,7 @@ static uint16 tab_jisx0208_uni16[]={ 0x529F,0x52B9,0x52FE,0x539A,0x53E3,0x5411}; /* page 17 0x3921-0x397E */ -static uint16 tab_jisx0208_uni17[]={ +static const uint16 tab_jisx0208_uni17[]={ 0x540E,0x5589,0x5751,0x57A2,0x597D,0x5B54,0x5B5D,0x5B8F, 0x5DE5,0x5DE7,0x5DF7,0x5E78,0x5E83,0x5E9A,0x5EB7,0x5F18, 0x6052,0x614C,0x6297,0x62D8,0x63A7,0x653B,0x6602,0x6643, @@ -524,7 +524,7 @@ static uint16 tab_jisx0208_uni17[]={ 0x7511,0x5FFD,0x60DA,0x9AA8,0x72DB,0x8FBC}; /* page 18 0x3A21-0x3A7E */ -static uint16 tab_jisx0208_uni18[]={ +static const uint16 tab_jisx0208_uni18[]={ 0x6B64,0x9803,0x4ECA,0x56F0,0x5764,0x58BE,0x5A5A,0x6068, 0x61C7,0x660F,0x6606,0x6839,0x68B1,0x6DF7,0x75D5,0x7D3A, 0x826E,0x9B42,0x4E9B,0x4F50,0x53C9,0x5506,0x5D6F,0x5DE6, @@ -539,7 +539,7 @@ static uint16 tab_jisx0208_uni18[]={ 0x685C,0x9BAD,0x7B39,0x5319,0x518A,0x5237}; /* page 19 0x3B21-0x3B7E */ -static uint16 tab_jisx0208_uni19[]={ +static const uint16 tab_jisx0208_uni19[]={ 0x5BDF,0x62F6,0x64AE,0x64E6,0x672D,0x6BBA,0x85A9,0x96D1, 0x7690,0x9BD6,0x634C,0x9306,0x9BAB,0x76BF,0x6652,0x4E09, 0x5098,0x53C2,0x5C71,0x60E8,0x6492,0x6563,0x685F,0x71E6, @@ -554,7 +554,7 @@ static uint16 tab_jisx0208_uni19[]={ 0x5150,0x5B57,0x5BFA,0x6148,0x6301,0x6642}; /* page 20 0x3C21-0x3C7E */ -static uint16 tab_jisx0208_uni20[]={ +static const uint16 tab_jisx0208_uni20[]={ 0x6B21,0x6ECB,0x6CBB,0x723E,0x74BD,0x75D4,0x78C1,0x793A, 0x800C,0x8033,0x81EA,0x8494,0x8F9E,0x6C50,0x9E7F,0x5F0F, 0x8B58,0x9D2B,0x7AFA,0x8EF8,0x5B8D,0x96EB,0x4E03,0x53F1, @@ -569,7 +569,7 @@ static uint16 tab_jisx0208_uni20[]={ 0x6A39,0x7DAC,0x9700,0x56DA,0x53CE,0x5468}; /* page 21 0x3D21-0x3D7E */ -static uint16 tab_jisx0208_uni21[]={ +static const uint16 tab_jisx0208_uni21[]={ 0x5B97,0x5C31,0x5DDE,0x4FEE,0x6101,0x62FE,0x6D32,0x79C0, 0x79CB,0x7D42,0x7E4D,0x7FD2,0x81ED,0x821F,0x8490,0x8846, 0x8972,0x8B90,0x8E74,0x8F2F,0x9031,0x914B,0x916C,0x96C6, @@ -584,7 +584,7 @@ static uint16 tab_jisx0208_uni21[]={ 0x5F90,0x6055,0x92E4,0x9664,0x50B7,0x511F}; /* page 22 0x3E21-0x3E7E */ -static uint16 tab_jisx0208_uni22[]={ +static const uint16 tab_jisx0208_uni22[]={ 0x52DD,0x5320,0x5347,0x53EC,0x54E8,0x5546,0x5531,0x5617, 0x5968,0x59BE,0x5A3C,0x5BB5,0x5C06,0x5C0F,0x5C11,0x5C1A, 0x5E84,0x5E8A,0x5EE0,0x5F70,0x627F,0x6284,0x62DB,0x638C, @@ -599,7 +599,7 @@ static uint16 tab_jisx0208_uni22[]={ 0x8B72,0x91B8,0x9320,0x5631,0x57F4,0x98FE}; /* page 23 0x3F21-0x3F7E */ -static uint16 tab_jisx0208_uni23[]={ +static const uint16 tab_jisx0208_uni23[]={ 0x62ED,0x690D,0x6B96,0x71ED,0x7E54,0x8077,0x8272,0x89E6, 0x98DF,0x8755,0x8FB1,0x5C3B,0x4F38,0x4FE1,0x4FB5,0x5507, 0x5A20,0x5BDD,0x5BE9,0x5FC3,0x614E,0x632F,0x65B0,0x664B, @@ -614,7 +614,7 @@ static uint16 tab_jisx0208_uni23[]={ 0x6749,0x6919,0x83C5,0x9817,0x96C0,0x88FE}; /* page 24 0x4021-0x407E */ -static uint16 tab_jisx0208_uni24[]={ +static const uint16 tab_jisx0208_uni24[]={ 0x6F84,0x647A,0x5BF8,0x4E16,0x702C,0x755D,0x662F,0x51C4, 0x5236,0x52E2,0x59D3,0x5F81,0x6027,0x6210,0x653F,0x6574, 0x661F,0x6674,0x68F2,0x6816,0x6B63,0x6E05,0x7272,0x751F, @@ -629,7 +629,7 @@ static uint16 tab_jisx0208_uni24[]={ 0x714E,0x717D,0x65CB,0x7A7F,0x7BAD,0x7DDA}; /* page 25 0x4121-0x417E */ -static uint16 tab_jisx0208_uni25[]={ +static const uint16 tab_jisx0208_uni25[]={ 0x7E4A,0x7FA8,0x817A,0x821B,0x8239,0x85A6,0x8A6E,0x8CCE, 0x8DF5,0x9078,0x9077,0x92AD,0x9291,0x9583,0x9BAE,0x524D, 0x5584,0x6F38,0x7136,0x5168,0x7985,0x7E55,0x81B3,0x7CCE, @@ -644,7 +644,7 @@ static uint16 tab_jisx0208_uni25[]={ 0x9397,0x971C,0x9A12,0x50CF,0x5897,0x618E}; /* page 26 0x4221-0x427E */ -static uint16 tab_jisx0208_uni26[]={ +static const uint16 tab_jisx0208_uni26[]={ 0x81D3,0x8535,0x8D08,0x9020,0x4FC3,0x5074,0x5247,0x5373, 0x606F,0x6349,0x675F,0x6E2C,0x8DB3,0x901F,0x4FD7,0x5C5E, 0x8CCA,0x65CF,0x7D9A,0x5352,0x8896,0x5176,0x63C3,0x5B58, @@ -659,7 +659,7 @@ static uint16 tab_jisx0208_uni26[]={ 0x6FC1,0x8AFE,0x8338,0x51E7,0x86F8,0x53EA}; /* page 27 0x4321-0x437E */ -static uint16 tab_jisx0208_uni27[]={ +static const uint16 tab_jisx0208_uni27[]={ 0x53E9,0x4F46,0x9054,0x8FB0,0x596A,0x8131,0x5DFD,0x7AEA, 0x8FBF,0x68DA,0x8C37,0x72F8,0x9C48,0x6A3D,0x8AB0,0x4E39, 0x5358,0x5606,0x5766,0x62C5,0x63A2,0x65E6,0x6B4E,0x6DE1, @@ -674,7 +674,7 @@ static uint16 tab_jisx0208_uni27[]={ 0x8CAF,0x4E01,0x5146,0x51CB,0x558B,0x5BF5}; /* page 28 0x4421-0x447E */ -static uint16 tab_jisx0208_uni28[]={ +static const uint16 tab_jisx0208_uni28[]={ 0x5E16,0x5E33,0x5E81,0x5F14,0x5F35,0x5F6B,0x5FB4,0x61F2, 0x6311,0x66A2,0x671D,0x6F6E,0x7252,0x753A,0x773A,0x8074, 0x8139,0x8178,0x8776,0x8ABF,0x8ADC,0x8D85,0x8DF3,0x929A, @@ -689,7 +689,7 @@ static uint16 tab_jisx0208_uni28[]={ 0x7DE0,0x8247,0x8A02,0x8AE6,0x8E44,0x9013}; /* page 29 0x4521-0x457E */ -static uint16 tab_jisx0208_uni29[]={ +static const uint16 tab_jisx0208_uni29[]={ 0x90B8,0x912D,0x91D8,0x9F0E,0x6CE5,0x6458,0x64E2,0x6575, 0x6EF4,0x7684,0x7B1B,0x9069,0x93D1,0x6EBA,0x54F2,0x5FB9, 0x64A4,0x8F4D,0x8FED,0x9244,0x5178,0x586B,0x5929,0x5C55, @@ -704,7 +704,7 @@ static uint16 tab_jisx0208_uni29[]={ 0x7B49,0x7B54,0x7B52,0x7CD6,0x7D71,0x5230}; /* page 30 0x4621-0x467E */ -static uint16 tab_jisx0208_uni30[]={ +static const uint16 tab_jisx0208_uni30[]={ 0x8463,0x8569,0x85E4,0x8A0E,0x8B04,0x8C46,0x8E0F,0x9003, 0x900F,0x9419,0x9676,0x982D,0x9A30,0x95D8,0x50CD,0x52D5, 0x540C,0x5802,0x5C0E,0x61A7,0x649E,0x6D1E,0x77B3,0x7AE5, @@ -719,7 +719,7 @@ static uint16 tab_jisx0208_uni30[]={ 0x8089,0x8679,0x5EFF,0x65E5,0x4E73,0x5165}; /* page 31 0x4721-0x477E */ -static uint16 tab_jisx0208_uni31[]={ +static const uint16 tab_jisx0208_uni31[]={ 0x5982,0x5C3F,0x97EE,0x4EFB,0x598A,0x5FCD,0x8A8D,0x6FE1, 0x79B0,0x7962,0x5BE7,0x8471,0x732B,0x71B1,0x5E74,0x5FF5, 0x637B,0x649A,0x71C3,0x7C98,0x4E43,0x5EFC,0x4E4B,0x57DC, @@ -734,7 +734,7 @@ static uint16 tab_jisx0208_uni31[]={ 0x6F20,0x7206,0x7E1B,0x83AB,0x99C1,0x9EA6}; /* page 32 0x4821-0x487E */ -static uint16 tab_jisx0208_uni32[]={ +static const uint16 tab_jisx0208_uni32[]={ 0x51FD,0x7BB1,0x7872,0x7BB8,0x8087,0x7B48,0x6AE8,0x5E61, 0x808C,0x7551,0x7560,0x516B,0x9262,0x6E8C,0x767A,0x9197, 0x9AEA,0x4F10,0x7F70,0x629C,0x7B4F,0x95A5,0x9CE9,0x567A, @@ -749,7 +749,7 @@ static uint16 tab_jisx0208_uni32[]={ 0x5FAE,0x6787,0x6BD8,0x7435,0x7709,0x7F8E}; /* page 33 0x4921-0x497E */ -static uint16 tab_jisx0208_uni33[]={ +static const uint16 tab_jisx0208_uni33[]={ 0x9F3B,0x67CA,0x7A17,0x5339,0x758B,0x9AED,0x5F66,0x819D, 0x83F1,0x8098,0x5F3C,0x5FC5,0x7562,0x7B46,0x903C,0x6867, 0x59EB,0x5A9B,0x7D10,0x767E,0x8B2C,0x4FF5,0x5F6A,0x6A19, @@ -764,7 +764,7 @@ static uint16 tab_jisx0208_uni33[]={ 0x8557,0x4F0F,0x526F,0x5FA9,0x5E45,0x670D}; /* page 34 0x4A21-0x4A7E */ -static uint16 tab_jisx0208_uni34[]={ +static const uint16 tab_jisx0208_uni34[]={ 0x798F,0x8179,0x8907,0x8986,0x6DF5,0x5F17,0x6255,0x6CB8, 0x4ECF,0x7269,0x9B92,0x5206,0x543B,0x5674,0x58B3,0x61A4, 0x626E,0x711A,0x596E,0x7C89,0x7CDE,0x7D1B,0x96F0,0x6587, @@ -779,7 +779,7 @@ static uint16 tab_jisx0208_uni34[]={ 0x5E96,0x62B1,0x6367,0x653E,0x65B9,0x670B}; /* page 35 0x4B21-0x4B7E */ -static uint16 tab_jisx0208_uni35[]={ +static const uint16 tab_jisx0208_uni35[]={ 0x6CD5,0x6CE1,0x70F9,0x7832,0x7E2B,0x80DE,0x82B3,0x840C, 0x84EC,0x8702,0x8912,0x8A2A,0x8C4A,0x90A6,0x92D2,0x98FD, 0x9CF3,0x9D6C,0x4E4F,0x4EA1,0x508D,0x5256,0x574A,0x59A8, @@ -794,7 +794,7 @@ static uint16 tab_jisx0208_uni35[]={ 0x4FAD,0x7E6D,0x9EBF,0x4E07,0x6162,0x6E80}; /* page 36 0x4C21-0x4C7E */ -static uint16 tab_jisx0208_uni36[]={ +static const uint16 tab_jisx0208_uni36[]={ 0x6F2B,0x8513,0x5473,0x672A,0x9B45,0x5DF3,0x7B95,0x5CAC, 0x5BC6,0x871C,0x6E4A,0x84D1,0x7A14,0x8108,0x5999,0x7C8D, 0x6C11,0x7720,0x52D9,0x5922,0x7121,0x725F,0x77DB,0x9727, @@ -809,7 +809,7 @@ static uint16 tab_jisx0208_uni36[]={ 0x85AE,0x9453,0x6109,0x6108,0x6CB9,0x7652}; /* page 37 0x4D21-0x4D7E */ -static uint16 tab_jisx0208_uni37[]={ +static const uint16 tab_jisx0208_uni37[]={ 0x8AED,0x8F38,0x552F,0x4F51,0x512A,0x52C7,0x53CB,0x5BA5, 0x5E7D,0x60A0,0x6182,0x63D6,0x6709,0x67DA,0x6E67,0x6D8C, 0x7336,0x7337,0x7531,0x7950,0x88D5,0x8A98,0x904A,0x9091, @@ -824,7 +824,7 @@ static uint16 tab_jisx0208_uni37[]={ 0x540F,0x5C65,0x674E,0x68A8,0x7406,0x7483}; /* page 38 0x4E21-0x4E7E */ -static uint16 tab_jisx0208_uni38[]={ +static const uint16 tab_jisx0208_uni38[]={ 0x75E2,0x88CF,0x88E1,0x91CC,0x96E2,0x9678,0x5F8B,0x7387, 0x7ACB,0x844E,0x63A0,0x7565,0x5289,0x6D41,0x6E9C,0x7409, 0x7559,0x786B,0x7C92,0x9686,0x7ADC,0x9F8D,0x4FB6,0x616E, @@ -839,7 +839,7 @@ static uint16 tab_jisx0208_uni38[]={ 0x6190,0x6F23,0x7149,0x7C3E,0x7DF4,0x806F}; /* page 39 0x4F21-0x4F53 */ -static uint16 tab_jisx0208_uni39[]={ +static const uint16 tab_jisx0208_uni39[]={ 0x84EE,0x9023,0x932C,0x5442,0x9B6F,0x6AD3,0x7089,0x8CC2, 0x8DEF,0x9732,0x52B4,0x5A41,0x5ECA,0x5F04,0x6717,0x697C, 0x6994,0x6D6A,0x6F0F,0x7262,0x72FC,0x7BED,0x8001,0x807E, @@ -849,7 +849,7 @@ static uint16 tab_jisx0208_uni39[]={ 0x6E7E,0x7897,0x8155}; /* page 40 0x5021-0x507E */ -static uint16 tab_jisx0208_uni40[]={ +static const uint16 tab_jisx0208_uni40[]={ 0x5F0C,0x4E10,0x4E15,0x4E2A,0x4E31,0x4E36,0x4E3C,0x4E3F, 0x4E42,0x4E56,0x4E58,0x4E82,0x4E85,0x8C6B,0x4E8A,0x8212, 0x5F0D,0x4E8E,0x4E9E,0x4E9F,0x4EA0,0x4EA2,0x4EB0,0x4EB3, @@ -864,7 +864,7 @@ static uint16 tab_jisx0208_uni40[]={ 0x5078,0x5080,0x509A,0x5085,0x50B4,0x50B2}; /* page 41 0x5121-0x517E */ -static uint16 tab_jisx0208_uni41[]={ +static const uint16 tab_jisx0208_uni41[]={ 0x50C9,0x50CA,0x50B3,0x50C2,0x50D6,0x50DE,0x50E5,0x50ED, 0x50E3,0x50EE,0x50F9,0x50F5,0x5109,0x5101,0x5102,0x5116, 0x5115,0x5114,0x511A,0x5121,0x513A,0x5137,0x513C,0x513B, @@ -879,7 +879,7 @@ static uint16 tab_jisx0208_uni41[]={ 0x5294,0x5292,0x5271,0x5288,0x5291,0x8FA8}; /* page 42 0x5221-0x527E */ -static uint16 tab_jisx0208_uni42[]={ +static const uint16 tab_jisx0208_uni42[]={ 0x8FA7,0x52AC,0x52AD,0x52BC,0x52B5,0x52C1,0x52CD,0x52D7, 0x52DE,0x52E3,0x52E6,0x98ED,0x52E0,0x52F3,0x52F5,0x52F8, 0x52F9,0x5306,0x5308,0x7538,0x530D,0x5310,0x530F,0x5315, @@ -894,7 +894,7 @@ static uint16 tab_jisx0208_uni42[]={ 0x54B8,0x54A5,0x54AC,0x54C4,0x54C8,0x54A8}; /* page 43 0x5321-0x537E */ -static uint16 tab_jisx0208_uni43[]={ +static const uint16 tab_jisx0208_uni43[]={ 0x54AB,0x54C2,0x54A4,0x54BE,0x54BC,0x54D8,0x54E5,0x54E6, 0x550F,0x5514,0x54FD,0x54EE,0x54ED,0x54FA,0x54E2,0x5539, 0x5540,0x5563,0x554C,0x552E,0x555C,0x5545,0x5556,0x5557, @@ -909,7 +909,7 @@ static uint16 tab_jisx0208_uni43[]={ 0x56EE,0x56F9,0x5700,0x56FF,0x5704,0x5709}; /* page 44 0x5421-0x547E */ -static uint16 tab_jisx0208_uni44[]={ +static const uint16 tab_jisx0208_uni44[]={ 0x5708,0x570B,0x570D,0x5713,0x5718,0x5716,0x55C7,0x571C, 0x5726,0x5737,0x5738,0x574E,0x573B,0x5740,0x574F,0x5769, 0x57C0,0x5788,0x5761,0x577F,0x5789,0x5793,0x57A0,0x57B3, @@ -924,7 +924,7 @@ static uint16 tab_jisx0208_uni44[]={ 0x5958,0x5962,0x5960,0x5967,0x596C,0x5969}; /* page 45 0x5521-0x557E */ -static uint16 tab_jisx0208_uni45[]={ +static const uint16 tab_jisx0208_uni45[]={ 0x5978,0x5981,0x599D,0x4F5E,0x4FAB,0x59A3,0x59B2,0x59C6, 0x59E8,0x59DC,0x598D,0x59D9,0x59DA,0x5A25,0x5A1F,0x5A11, 0x5A1C,0x5A09,0x5A1A,0x5A40,0x5A6C,0x5A49,0x5A35,0x5A36, @@ -939,7 +939,7 @@ static uint16 tab_jisx0208_uni45[]={ 0x5C38,0x5C39,0x5C41,0x5C46,0x5C4E,0x5C53}; /* page 46 0x5621-0x567E */ -static uint16 tab_jisx0208_uni46[]={ +static const uint16 tab_jisx0208_uni46[]={ 0x5C50,0x5C4F,0x5B71,0x5C6C,0x5C6E,0x4E62,0x5C76,0x5C79, 0x5C8C,0x5C91,0x5C94,0x599B,0x5CAB,0x5CBB,0x5CB6,0x5CBC, 0x5CB7,0x5CC5,0x5CBE,0x5CC7,0x5CD9,0x5CE9,0x5CFD,0x5CFA, @@ -954,7 +954,7 @@ static uint16 tab_jisx0208_uni46[]={ 0x5EA0,0x5EC1,0x5EC2,0x5EC8,0x5ED0,0x5ECF}; /* page 47 0x5721-0x577E */ -static uint16 tab_jisx0208_uni47[]={ +static const uint16 tab_jisx0208_uni47[]={ 0x5ED6,0x5EE3,0x5EDD,0x5EDA,0x5EDB,0x5EE2,0x5EE1,0x5EE8, 0x5EE9,0x5EEC,0x5EF1,0x5EF3,0x5EF0,0x5EF4,0x5EF8,0x5EFE, 0x5F03,0x5F09,0x5F5D,0x5F5C,0x5F0B,0x5F11,0x5F16,0x5F29, @@ -969,7 +969,7 @@ static uint16 tab_jisx0208_uni47[]={ 0x6059,0x6081,0x608D,0x60E7,0x6083,0x609A}; /* page 48 0x5821-0x587E */ -static uint16 tab_jisx0208_uni48[]={ +static const uint16 tab_jisx0208_uni48[]={ 0x6084,0x609B,0x6096,0x6097,0x6092,0x60A7,0x608B,0x60E1, 0x60B8,0x60E0,0x60D3,0x60B4,0x5FF0,0x60BD,0x60C6,0x60B5, 0x60D8,0x614D,0x6115,0x6106,0x60F6,0x60F7,0x6100,0x60F4, @@ -984,7 +984,7 @@ static uint16 tab_jisx0208_uni48[]={ 0x6208,0x6209,0x620D,0x620C,0x6214,0x621B}; /* page 49 0x5921-0x597E */ -static uint16 tab_jisx0208_uni49[]={ +static const uint16 tab_jisx0208_uni49[]={ 0x621E,0x6221,0x622A,0x622E,0x6230,0x6232,0x6233,0x6241, 0x624E,0x625E,0x6263,0x625B,0x6260,0x6268,0x627C,0x6282, 0x6289,0x627E,0x6292,0x6293,0x6296,0x62D4,0x6283,0x6294, @@ -999,7 +999,7 @@ static uint16 tab_jisx0208_uni49[]={ 0x6495,0x6493,0x64A5,0x64A9,0x6488,0x64BC}; /* page 50 0x5A21-0x5A7E */ -static uint16 tab_jisx0208_uni50[]={ +static const uint16 tab_jisx0208_uni50[]={ 0x64DA,0x64D2,0x64C5,0x64C7,0x64BB,0x64D8,0x64C2,0x64F1, 0x64E7,0x8209,0x64E0,0x64E1,0x62AC,0x64E3,0x64EF,0x652C, 0x64F6,0x64F4,0x64F2,0x64FA,0x6500,0x64FD,0x6518,0x651C, @@ -1014,7 +1014,7 @@ static uint16 tab_jisx0208_uni50[]={ 0x669D,0x66C1,0x66B9,0x66C9,0x66BE,0x66BC}; /* page 51 0x5B21-0x5B7E */ -static uint16 tab_jisx0208_uni51[]={ +static const uint16 tab_jisx0208_uni51[]={ 0x66C4,0x66B8,0x66D6,0x66DA,0x66E0,0x663F,0x66E6,0x66E9, 0x66F0,0x66F5,0x66F7,0x670F,0x6716,0x671E,0x6726,0x6727, 0x9738,0x672E,0x673F,0x6736,0x6741,0x6738,0x6737,0x6746, @@ -1029,7 +1029,7 @@ static uint16 tab_jisx0208_uni51[]={ 0x68D8,0x6922,0x6926,0x68E1,0x690C,0x68CD}; /* page 52 0x5C21-0x5C7E */ -static uint16 tab_jisx0208_uni52[]={ +static const uint16 tab_jisx0208_uni52[]={ 0x68D4,0x68E7,0x68D5,0x6936,0x6912,0x6904,0x68D7,0x68E3, 0x6925,0x68F9,0x68E0,0x68EF,0x6928,0x692A,0x691A,0x6923, 0x6921,0x68C6,0x6979,0x6977,0x695C,0x6978,0x696B,0x6954, @@ -1044,7 +1044,7 @@ static uint16 tab_jisx0208_uni52[]={ 0x6A90,0x6A8D,0x6AA0,0x6A84,0x6AA2,0x6AA3}; /* page 53 0x5D21-0x5D7E */ -static uint16 tab_jisx0208_uni53[]={ +static const uint16 tab_jisx0208_uni53[]={ 0x6A97,0x8617,0x6ABB,0x6AC3,0x6AC2,0x6AB8,0x6AB3,0x6AAC, 0x6ADE,0x6AD1,0x6ADF,0x6AAA,0x6ADA,0x6AEA,0x6AFB,0x6B05, 0x8616,0x6AFA,0x6B12,0x6B16,0x9B31,0x6B1F,0x6B38,0x6B37, @@ -1059,7 +1059,7 @@ static uint16 tab_jisx0208_uni53[]={ 0x6CD7,0x6CC5,0x6CDD,0x6CAE,0x6CB1,0x6CBE}; /* page 54 0x5E21-0x5E7E */ -static uint16 tab_jisx0208_uni54[]={ +static const uint16 tab_jisx0208_uni54[]={ 0x6CBA,0x6CDB,0x6CEF,0x6CD9,0x6CEA,0x6D1F,0x884D,0x6D36, 0x6D2B,0x6D3D,0x6D38,0x6D19,0x6D35,0x6D33,0x6D12,0x6D0C, 0x6D63,0x6D93,0x6D64,0x6D5A,0x6D79,0x6D59,0x6D8E,0x6D95, @@ -1074,7 +1074,7 @@ static uint16 tab_jisx0208_uni54[]={ 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; /* page 55 0x5F21-0x5F7E */ -static uint16 tab_jisx0208_uni55[]={ +static const uint16 tab_jisx0208_uni55[]={ 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, @@ -1089,7 +1089,7 @@ static uint16 tab_jisx0208_uni55[]={ 0x71CE,0x71E0,0x71EC,0x71E7,0x71F5,0x71FC}; /* page 56 0x6021-0x607E */ -static uint16 tab_jisx0208_uni56[]={ +static const uint16 tab_jisx0208_uni56[]={ 0x71F9,0x71FF,0x720D,0x7210,0x721B,0x7228,0x722D,0x722C, 0x7230,0x7232,0x723B,0x723C,0x723F,0x7240,0x7246,0x724B, 0x7258,0x7274,0x727E,0x7282,0x7281,0x7287,0x7292,0x7296, @@ -1104,7 +1104,7 @@ static uint16 tab_jisx0208_uni56[]={ 0x749E,0x74A7,0x74CA,0x74CF,0x74D4,0x73F1}; /* page 57 0x6121-0x617E */ -static uint16 tab_jisx0208_uni57[]={ +static const uint16 tab_jisx0208_uni57[]={ 0x74E0,0x74E3,0x74E7,0x74E9,0x74EE,0x74F2,0x74F0,0x74F1, 0x74F8,0x74F7,0x7504,0x7503,0x7505,0x750C,0x750E,0x750D, 0x7515,0x7513,0x751E,0x7526,0x752C,0x753C,0x7544,0x754D, @@ -1119,7 +1119,7 @@ static uint16 tab_jisx0208_uni57[]={ 0x7668,0x7669,0x766A,0x7667,0x766C,0x7670}; /* page 58 0x6221-0x627E */ -static uint16 tab_jisx0208_uni58[]={ +static const uint16 tab_jisx0208_uni58[]={ 0x7672,0x7676,0x7678,0x767C,0x7680,0x7683,0x7688,0x768B, 0x768E,0x7696,0x7693,0x7699,0x769A,0x76B0,0x76B4,0x76B8, 0x76B9,0x76BA,0x76C2,0x76CD,0x76D6,0x76D2,0x76DE,0x76E1, @@ -1134,7 +1134,7 @@ static uint16 tab_jisx0208_uni58[]={ 0x78D4,0x78BE,0x78BC,0x78C5,0x78CA,0x78EC}; /* page 59 0x6321-0x637E */ -static uint16 tab_jisx0208_uni59[]={ +static const uint16 tab_jisx0208_uni59[]={ 0x78E7,0x78DA,0x78FD,0x78F4,0x7907,0x7912,0x7911,0x7919, 0x792C,0x792B,0x7940,0x7960,0x7957,0x795F,0x795A,0x7955, 0x7953,0x797A,0x797F,0x798A,0x799D,0x79A7,0x9F4B,0x79AA, @@ -1149,7 +1149,7 @@ static uint16 tab_jisx0208_uni59[]={ 0x7B19,0x7B1E,0x7B35,0x7B28,0x7B36,0x7B50}; /* page 60 0x6421-0x647E */ -static uint16 tab_jisx0208_uni60[]={ +static const uint16 tab_jisx0208_uni60[]={ 0x7B7A,0x7B04,0x7B4D,0x7B0B,0x7B4C,0x7B45,0x7B75,0x7B65, 0x7B74,0x7B67,0x7B70,0x7B71,0x7B6C,0x7B6E,0x7B9D,0x7B98, 0x7B9F,0x7B8D,0x7B9C,0x7B9A,0x7B8B,0x7B92,0x7B8F,0x7B5D, @@ -1164,7 +1164,7 @@ static uint16 tab_jisx0208_uni60[]={ 0x7CEF,0x7CF2,0x7CF4,0x7CF6,0x7CFA,0x7D06}; /* page 61 0x6521-0x657E */ -static uint16 tab_jisx0208_uni61[]={ +static const uint16 tab_jisx0208_uni61[]={ 0x7D02,0x7D1C,0x7D15,0x7D0A,0x7D45,0x7D4B,0x7D2E,0x7D32, 0x7D3F,0x7D35,0x7D46,0x7D73,0x7D56,0x7D4E,0x7D72,0x7D68, 0x7D6E,0x7D4F,0x7D63,0x7D93,0x7D89,0x7D5B,0x7D8F,0x7D7D, @@ -1179,7 +1179,7 @@ static uint16 tab_jisx0208_uni61[]={ 0x7E96,0x7E8E,0x7E9B,0x7E9C,0x7F38,0x7F3A}; /* page 62 0x6621-0x667E */ -static uint16 tab_jisx0208_uni62[]={ +static const uint16 tab_jisx0208_uni62[]={ 0x7F45,0x7F4C,0x7F4D,0x7F4E,0x7F50,0x7F51,0x7F55,0x7F54, 0x7F58,0x7F5F,0x7F60,0x7F68,0x7F69,0x7F67,0x7F78,0x7F82, 0x7F86,0x7F83,0x7F88,0x7F87,0x7F8C,0x7F94,0x7F9E,0x7F9D, @@ -1194,7 +1194,7 @@ static uint16 tab_jisx0208_uni62[]={ 0x80F1,0x811B,0x8129,0x8123,0x812F,0x814B}; /* page 63 0x6721-0x677E */ -static uint16 tab_jisx0208_uni63[]={ +static const uint16 tab_jisx0208_uni63[]={ 0x968B,0x8146,0x813E,0x8153,0x8151,0x80FC,0x8171,0x816E, 0x8165,0x8166,0x8174,0x8183,0x8188,0x818A,0x8180,0x8182, 0x81A0,0x8195,0x81A4,0x81A3,0x815F,0x8193,0x81A9,0x81B0, @@ -1209,7 +1209,7 @@ static uint16 tab_jisx0208_uni63[]={ 0x82F9,0x82DE,0x8306,0x82DC,0x8309,0x82D9}; /* page 64 0x6821-0x687E */ -static uint16 tab_jisx0208_uni64[]={ +static const uint16 tab_jisx0208_uni64[]={ 0x8335,0x8334,0x8316,0x8332,0x8331,0x8340,0x8339,0x8350, 0x8345,0x832F,0x832B,0x8317,0x8318,0x8385,0x839A,0x83AA, 0x839F,0x83A2,0x8396,0x8323,0x838E,0x8387,0x838A,0x837C, @@ -1224,7 +1224,7 @@ static uint16 tab_jisx0208_uni64[]={ 0x8514,0x84FC,0x8540,0x8563,0x8558,0x8548}; /* page 65 0x6921-0x697E */ -static uint16 tab_jisx0208_uni65[]={ +static const uint16 tab_jisx0208_uni65[]={ 0x8541,0x8602,0x854B,0x8555,0x8580,0x85A4,0x8588,0x8591, 0x858A,0x85A8,0x856D,0x8594,0x859B,0x85EA,0x8587,0x859C, 0x8577,0x857E,0x8590,0x85C9,0x85BA,0x85CF,0x85B9,0x85D0, @@ -1239,7 +1239,7 @@ static uint16 tab_jisx0208_uni65[]={ 0x874E,0x8774,0x8757,0x8768,0x876E,0x8759}; /* page 66 0x6A21-0x6A7E */ -static uint16 tab_jisx0208_uni66[]={ +static const uint16 tab_jisx0208_uni66[]={ 0x8753,0x8763,0x876A,0x8805,0x87A2,0x879F,0x8782,0x87AF, 0x87CB,0x87BD,0x87C0,0x87D0,0x96D6,0x87AB,0x87C4,0x87B3, 0x87C7,0x87C6,0x87BB,0x87EF,0x87F2,0x87E0,0x880F,0x880D, @@ -1254,7 +1254,7 @@ static uint16 tab_jisx0208_uni66[]={ 0x8936,0x8938,0x894C,0x891D,0x8960,0x895E}; /* page 67 0x6B21-0x6B7E */ -static uint16 tab_jisx0208_uni67[]={ +static const uint16 tab_jisx0208_uni67[]={ 0x8966,0x8964,0x896D,0x896A,0x896F,0x8974,0x8977,0x897E, 0x8983,0x8988,0x898A,0x8993,0x8998,0x89A1,0x89A9,0x89A6, 0x89AC,0x89AF,0x89B2,0x89BA,0x89BD,0x89BF,0x89C0,0x89DA, @@ -1269,7 +1269,7 @@ static uint16 tab_jisx0208_uni67[]={ 0x8B4E,0x8B49,0x8B56,0x8B5B,0x8B5A,0x8B6B}; /* page 68 0x6C21-0x6C7E */ -static uint16 tab_jisx0208_uni68[]={ +static const uint16 tab_jisx0208_uni68[]={ 0x8B5F,0x8B6C,0x8B6F,0x8B74,0x8B7D,0x8B80,0x8B8C,0x8B8E, 0x8B92,0x8B93,0x8B96,0x8B99,0x8B9A,0x8C3A,0x8C41,0x8C3F, 0x8C48,0x8C4C,0x8C4E,0x8C50,0x8C55,0x8C62,0x8C6C,0x8C78, @@ -1284,7 +1284,7 @@ static uint16 tab_jisx0208_uni68[]={ 0x8E1F,0x8E42,0x8E35,0x8E30,0x8E34,0x8E4A}; /* page 69 0x6D21-0x6D7E */ -static uint16 tab_jisx0208_uni69[]={ +static const uint16 tab_jisx0208_uni69[]={ 0x8E47,0x8E49,0x8E4C,0x8E50,0x8E48,0x8E59,0x8E64,0x8E60, 0x8E2A,0x8E63,0x8E55,0x8E76,0x8E72,0x8E7C,0x8E81,0x8E87, 0x8E85,0x8E84,0x8E8B,0x8E8A,0x8E93,0x8E91,0x8E94,0x8E99, @@ -1299,7 +1299,7 @@ static uint16 tab_jisx0208_uni69[]={ 0x900B,0x9027,0x9036,0x9035,0x9039,0x8FF8}; /* page 70 0x6E21-0x6E7E */ -static uint16 tab_jisx0208_uni70[]={ +static const uint16 tab_jisx0208_uni70[]={ 0x904F,0x9050,0x9051,0x9052,0x900E,0x9049,0x903E,0x9056, 0x9058,0x905E,0x9068,0x906F,0x9076,0x96A8,0x9072,0x9082, 0x907D,0x9081,0x9080,0x908A,0x9089,0x908F,0x90A8,0x90AF, @@ -1314,7 +1314,7 @@ static uint16 tab_jisx0208_uni70[]={ 0x92B7,0x92E9,0x930F,0x92FA,0x9344,0x932E}; /* page 71 0x6F21-0x6F7E */ -static uint16 tab_jisx0208_uni71[]={ +static const uint16 tab_jisx0208_uni71[]={ 0x9319,0x9322,0x931A,0x9323,0x933A,0x9335,0x933B,0x935C, 0x9360,0x937C,0x936E,0x9356,0x93B0,0x93AC,0x93AD,0x9394, 0x93B9,0x93D6,0x93D7,0x93E8,0x93E5,0x93D8,0x93C3,0x93DD, @@ -1329,7 +1329,7 @@ static uint16 tab_jisx0208_uni71[]={ 0x964C,0x964F,0x964B,0x9677,0x965C,0x965E}; /* page 72 0x7021-0x707E */ -static uint16 tab_jisx0208_uni72[]={ +static const uint16 tab_jisx0208_uni72[]={ 0x965D,0x965F,0x9666,0x9672,0x966C,0x968D,0x9698,0x9695, 0x9697,0x96AA,0x96A7,0x96B1,0x96B2,0x96B0,0x96B4,0x96B6, 0x96B8,0x96B9,0x96CE,0x96CB,0x96C9,0x96CD,0x894D,0x96DC, @@ -1344,7 +1344,7 @@ static uint16 tab_jisx0208_uni72[]={ 0x9846,0x984F,0x984B,0x986B,0x986F,0x9870}; /* page 73 0x7121-0x717E */ -static uint16 tab_jisx0208_uni73[]={ +static const uint16 tab_jisx0208_uni73[]={ 0x9871,0x9874,0x9873,0x98AA,0x98AF,0x98B1,0x98B6,0x98C4, 0x98C3,0x98C6,0x98E9,0x98EB,0x9903,0x9909,0x9912,0x9914, 0x9918,0x9921,0x991D,0x991E,0x9924,0x9920,0x992C,0x992E, @@ -1359,7 +1359,7 @@ static uint16 tab_jisx0208_uni73[]={ 0x9AEF,0x9AEB,0x9AEE,0x9AF4,0x9AF1,0x9AF7}; /* page 74 0x7221-0x727E */ -static uint16 tab_jisx0208_uni74[]={ +static const uint16 tab_jisx0208_uni74[]={ 0x9AFB,0x9B06,0x9B18,0x9B1A,0x9B1F,0x9B22,0x9B23,0x9B25, 0x9B27,0x9B28,0x9B29,0x9B2A,0x9B2E,0x9B2F,0x9B32,0x9B44, 0x9B43,0x9B4F,0x9B4D,0x9B4E,0x9B51,0x9B58,0x9B74,0x9B93, @@ -1374,7 +1374,7 @@ static uint16 tab_jisx0208_uni74[]={ 0x9D12,0x9D41,0x9D3F,0x9D3E,0x9D46,0x9D48}; /* page 75 0x7321-0x737E */ -static uint16 tab_jisx0208_uni75[]={ +static const uint16 tab_jisx0208_uni75[]={ 0x9D5D,0x9D5E,0x9D64,0x9D51,0x9D50,0x9D59,0x9D72,0x9D89, 0x9D87,0x9DAB,0x9D6F,0x9D7A,0x9D9A,0x9DA4,0x9DA9,0x9DB2, 0x9DC4,0x9DC1,0x9DBB,0x9DB8,0x9DBA,0x9DC6,0x9DCF,0x9DC2, @@ -1389,11 +1389,11 @@ static uint16 tab_jisx0208_uni75[]={ 0x9F77,0x9F72,0x9F76,0x9F95,0x9F9C,0x9FA0}; /* page 76 0x7421-0x7426 */ -static uint16 tab_jisx0208_uni76[]={ +static const uint16 tab_jisx0208_uni76[]={ 0x582F,0x69C7,0x9059,0x7464,0x51DC,0x7199}; /* page 77 0x2D21 - 0x2D7C */ -static uint16 tab_nec13_uni0[]={ +static const uint16 tab_nec13_uni0[]={ 0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467, 0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F, 0x2470,0x2471,0x2472,0x2473,0x2160,0x2161,0x2162,0x2163, @@ -1569,25 +1569,25 @@ my_jisx0208_uni_onechar(int code){ } /* page 0 0x005C-0x005C */ -static uint16 tab_uni_jisx02080[]={ +static const uint16 tab_uni_jisx02080[]={ 0x5C}; /* page 1 0x00A2-0x00B6 */ -static uint16 tab_uni_jisx02081[]={ +static const uint16 tab_uni_jisx02081[]={ 0, 0, 0, 0, 0,0x2178,0x212F, 0, 0, 0, 0, 0, 0, 0,0x216B,0x215E, 0, 0,0x212D, 0,0x2279}; /* page 2 0x00D7-0x00D7 */ -static uint16 tab_uni_jisx02082[]={ +static const uint16 tab_uni_jisx02082[]={ 0x215F}; /* page 3 0x00F7-0x00F7 */ -static uint16 tab_uni_jisx02083[]={ +static const uint16 tab_uni_jisx02083[]={ 0x2160}; /* page 4 0x0391-0x03C9 */ -static uint16 tab_uni_jisx02084[]={ +static const uint16 tab_uni_jisx02084[]={ 0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628, 0x2629,0x262A,0x262B,0x262C,0x262D,0x262E,0x262F,0x2630, 0x2631, 0,0x2632,0x2633,0x2634,0x2635,0x2636,0x2637, @@ -1598,7 +1598,7 @@ static uint16 tab_uni_jisx02084[]={ 0x2658}; /* page 5 0x0401-0x0451 */ -static uint16 tab_uni_jisx02085[]={ +static const uint16 tab_uni_jisx02085[]={ 0x2727, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2721, 0x2722,0x2723,0x2724,0x2725,0x2726,0x2728,0x2729,0x272A, @@ -1612,7 +1612,7 @@ static uint16 tab_uni_jisx02085[]={ 0x2757}; /* page 6 0x2010-0x203B */ -static uint16 tab_uni_jisx02086[]={ +static const uint16 tab_uni_jisx02086[]={ 0x213E, 0, 0, 0, 0,0x213D, 0, 0, 0x2146,0x2147, 0, 0,0x2148,0x2149, 0, 0, 0x2277,0x2278, 0, 0, 0,0x2145,0x2144, 0, @@ -1621,31 +1621,31 @@ static uint16 tab_uni_jisx02086[]={ 0, 0, 0,0x2228}; /* page 7 0x2100-0x2116 */ -static uint16 tab_uni_jisx02087[]={ +static const uint16 tab_uni_jisx02087[]={ 0, 0, 0,0x216E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2D62}; /* page 8 0x2120-0x212B */ -static uint16 tab_uni_jisx02088[]={ +static const uint16 tab_uni_jisx02088[]={ 0,0x2D64, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2272}; /* page 9 0x2160-0x2169 */ -static uint16 tab_uni_jisx02089[]={ +static const uint16 tab_uni_jisx02089[]={ 0x2D35,0x2D36,0x2D37,0x2D38,0x2D39,0x2D3A,0x2D3B,0x2D3C, 0x2D3D,0x2D3E}; /* page 10 0x2190-0x2193 */ -static uint16 tab_uni_jisx020810[]={ +static const uint16 tab_uni_jisx020810[]={ 0x222B,0x222C,0x222A,0x222D}; /* page 11 0x21D2-0x21D4 */ -static uint16 tab_uni_jisx020811[]={ +static const uint16 tab_uni_jisx020811[]={ 0x224D, 0,0x224E}; /* page 12 0x2200-0x223D */ -static uint16 tab_uni_jisx020812[]={ +static const uint16 tab_uni_jisx020812[]={ 0x224F, 0,0x225F,0x2250, 0, 0, 0,0x2260, 0x223A, 0, 0,0x223B, 0, 0, 0, 0, 0,0x2D74, 0, 0, 0, 0, 0, 0, @@ -1656,35 +1656,35 @@ static uint16 tab_uni_jisx020812[]={ 0, 0, 0, 0, 0,0x2266}; /* page 13 0x2252-0x226B */ -static uint16 tab_uni_jisx020813[]={ +static const uint16 tab_uni_jisx020813[]={ 0x2262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2162,0x2261, 0, 0, 0, 0,0x2165,0x2166, 0, 0, 0x2263,0x2264}; /* page 14 0x2282-0x2287 */ -static uint16 tab_uni_jisx020814[]={ +static const uint16 tab_uni_jisx020814[]={ 0x223E,0x223F, 0, 0,0x223C,0x223D}; /* page 15 0x22A0-0x22BF */ -static uint16 tab_uni_jisx020815[]={ +static const uint16 tab_uni_jisx020815[]={ 0, 0, 0, 0, 0,0x225D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2D79}; /* page 16 0x2312-0x2312 */ -static uint16 tab_uni_jisx020816[]={ +static const uint16 tab_uni_jisx020816[]={ 0x225E}; /* page 17 0x2460-0x2473 */ -static uint16 tab_uni_jisx020817[]={ +static const uint16 tab_uni_jisx020817[]={ 0x2D21,0x2D22,0x2D23,0x2D24,0x2D25,0x2D26,0x2D27,0x2D28, 0x2D29,0x2D2A,0x2D2B,0x2D2C,0x2D2D,0x2D2E,0x2D2F,0x2D30, 0x2D31,0x2D32,0x2D33,0x2D34}; /* page 18 0x2500-0x254B */ -static uint16 tab_uni_jisx020818[]={ +static const uint16 tab_uni_jisx020818[]={ 0x2821,0x282C,0x2822,0x282D, 0, 0, 0, 0, 0, 0, 0, 0,0x2823, 0, 0,0x282E, 0x2824, 0, 0,0x282F,0x2826, 0, 0,0x2831, @@ -1697,7 +1697,7 @@ static uint16 tab_uni_jisx020818[]={ 0, 0, 0,0x2836}; /* page 19 0x25A0-0x25CF */ -static uint16 tab_uni_jisx020819[]={ +static const uint16 tab_uni_jisx020819[]={ 0x2223,0x2222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2225,0x2224, 0, 0, 0, 0, @@ -1707,30 +1707,30 @@ static uint16 tab_uni_jisx020819[]={ }; /* page 20 0x25EF-0x25EF */ -static uint16 tab_uni_jisx020820[]={ +static const uint16 tab_uni_jisx020820[]={ 0x227E}; /* page 21 0x2605-0x2606 */ -static uint16 tab_uni_jisx020821[]={ +static const uint16 tab_uni_jisx020821[]={ 0x217A,0x2179}; /* page 22 0x2640-0x2642 */ -static uint16 tab_uni_jisx020822[]={ +static const uint16 tab_uni_jisx020822[]={ 0x216A, 0,0x2169}; /* page 23 0x266A-0x266F */ -static uint16 tab_uni_jisx020823[]={ +static const uint16 tab_uni_jisx020823[]={ 0x2276, 0, 0,0x2275, 0,0x2274}; /* page 24 0x3000-0x301F */ -static uint16 tab_uni_jisx020824[]={ +static const uint16 tab_uni_jisx020824[]={ 0x2121,0x2122,0x2123,0x2137, 0,0x2139,0x213A,0x213B, 0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159, 0x215A,0x215B,0x2229,0x222E,0x214C,0x214D, 0, 0, 0, 0, 0, 0, 0,0x2D60, 0,0x2D61}; /* page 25 0x3041-0x30FE */ -static uint16 tab_uni_jisx020825[]={ +static const uint16 tab_uni_jisx020825[]={ 0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428, 0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,0x2430, 0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438, @@ -1757,17 +1757,17 @@ static uint16 tab_uni_jisx020825[]={ 0, 0,0x2126,0x213C,0x2133,0x2134}; /* page 26 0x3230-0x3239 */ -static uint16 tab_uni_jisx020826[]={ +static const uint16 tab_uni_jisx020826[]={ 0,0x2D6A,0x2D6B, 0, 0, 0, 0, 0, 0,0x2D6C}; /* page 27 0x32A0-0x32A8 */ -static uint16 tab_uni_jisx020827[]={ +static const uint16 tab_uni_jisx020827[]={ 0, 0, 0, 0,0x2D65,0x2D66,0x2D67,0x2D68, 0x2D69}; /* page 28 0x3300-0x33CD */ -static uint16 tab_uni_jisx020828[]={ +static const uint16 tab_uni_jisx020828[]={ 0, 0, 0,0x2D46, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2D4A, 0, 0, 0, 0, 0, 0,0x2D41, 0, 0, 0, @@ -1796,7 +1796,7 @@ static uint16 tab_uni_jisx020828[]={ 0, 0, 0, 0, 0,0x2D63}; /* page 29 0x4E00-0x5516 */ -static uint16 tab_uni_jisx020829[]={ +static const uint16 tab_uni_jisx020829[]={ 0x306C,0x437A, 0,0x3C37, 0, 0, 0,0x4B7C, 0x3E66,0x3B30,0x3E65,0x323C, 0,0x4954,0x4D3F, 0, 0x5022,0x312F, 0, 0,0x336E,0x5023,0x4024,0x5242, @@ -2026,7 +2026,7 @@ static uint16 tab_uni_jisx020829[]={ 0x4562, 0, 0, 0,0x532A, 0,0x3022}; /* page 30 0x552E-0x5563 */ -static uint16 tab_uni_jisx020830[]={ +static const uint16 tab_uni_jisx020830[]={ 0x5334,0x4D23, 0,0x3E27, 0,0x533A, 0, 0, 0, 0,0x5339,0x5330, 0, 0, 0, 0, 0x4243, 0,0x5331, 0, 0, 0,0x426F,0x5336, @@ -2036,7 +2036,7 @@ static uint16 tab_uni_jisx020830[]={ 0, 0, 0, 0, 0,0x5332}; /* page 31 0x557B-0x576A */ -static uint16 tab_uni_jisx020831[]={ +static const uint16 tab_uni_jisx020831[]={ 0x5341,0x5346, 0,0x5342, 0,0x533D, 0, 0, 0x5347,0x4131, 0, 0,0x5349, 0,0x3922,0x533F, 0x437D, 0, 0, 0, 0, 0, 0, 0, @@ -2102,7 +2102,7 @@ static uint16 tab_uni_jisx020831[]={ }; /* page 32 0x577F-0x5A9B */ -static uint16 tab_uni_jisx020832[]={ +static const uint16 tab_uni_jisx020832[]={ 0x5434, 0, 0,0x3F62, 0, 0, 0, 0, 0,0x5432,0x5435, 0,0x373F, 0, 0, 0, 0, 0, 0, 0,0x5436, 0, 0, 0, @@ -2205,7 +2205,7 @@ static uint16 tab_uni_jisx020832[]={ 0, 0, 0,0x553B,0x4932}; /* page 33 0x5ABC-0x5D29 */ -static uint16 tab_uni_jisx020833[]={ +static const uint16 tab_uni_jisx020833[]={ 0x553C,0x5540,0x553D, 0, 0,0x3247,0x553F, 0, 0, 0, 0, 0, 0,0x3C3B, 0,0x553E, 0x3779, 0, 0, 0,0x554C, 0, 0, 0, @@ -2286,7 +2286,7 @@ static uint16 tab_uni_jisx020833[]={ 0, 0, 0, 0, 0,0x4A78}; /* page 34 0x5D4B-0x6BF3 */ -static uint16 tab_uni_jisx020834[]={ +static const uint16 tab_uni_jisx020834[]={ 0x564B,0x5648, 0,0x564A, 0,0x4D72, 0,0x5649, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x563F, 0, 0, 0, 0, 0, 0, @@ -2759,7 +2759,7 @@ static uint16 tab_uni_jisx020834[]={ 0x5D5E}; /* page 35 0x6C08-0x6CF3 */ -static uint16 tab_uni_jisx020835[]={ +static const uint16 tab_uni_jisx020835[]={ 0x5D61, 0, 0, 0, 0, 0, 0,0x3B61, 0,0x4C31, 0,0x5D62,0x5D63, 0, 0,0x3524, 0, 0, 0,0x5D64, 0, 0, 0, 0, @@ -2792,7 +2792,7 @@ static uint16 tab_uni_jisx020835[]={ 0x4259,0x5D76, 0,0x314B}; /* page 36 0x6D0B-0x7409 */ -static uint16 tab_uni_jisx020836[]={ +static const uint16 tab_uni_jisx020836[]={ 0x4D4E,0x5E30, 0, 0, 0, 0, 0,0x5E2F, 0, 0, 0, 0,0x4076, 0,0x5E2C, 0, 0x4D6C, 0, 0,0x4636,0x5E26, 0, 0, 0, @@ -3019,7 +3019,7 @@ static uint16 tab_uni_jisx020836[]={ 0x3565, 0,0x6066,0x4D7D, 0, 0,0x4E30}; /* page 37 0x7422-0x7845 */ -static uint16 tab_uni_jisx020837[]={ +static const uint16 tab_uni_jisx020837[]={ 0x4276, 0, 0,0x6068, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x606A,0x4E56,0x3657,0x487C,0x474A, 0, 0, 0, @@ -3155,7 +3155,7 @@ static uint16 tab_uni_jisx020837[]={ 0, 0, 0,0x626B}; /* page 38 0x785D-0x7E9C */ -static uint16 tab_uni_jisx020838[]={ +static const uint16 tab_uni_jisx020838[]={ 0x3E4B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x4E32,0x3945, 0, 0,0x3827, 0, 0,0x4823, 0,0x626D, @@ -3359,7 +3359,7 @@ static uint16 tab_uni_jisx020838[]={ }; /* page 39 0x7F36-0x8358 */ -static uint16 tab_uni_jisx020839[]={ +static const uint16 tab_uni_jisx020839[]={ 0x344C, 0,0x657D, 0,0x657E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x6621, 0, 0, 0, 0, 0, 0,0x6622,0x6623, @@ -3495,7 +3495,7 @@ static uint16 tab_uni_jisx020839[]={ 0, 0,0x4171}; /* page 40 0x8373-0x8B9A */ -static uint16 tab_uni_jisx020840[]={ +static const uint16 tab_uni_jisx020840[]={ 0x683A, 0,0x683B, 0,0x3259, 0, 0, 0, 0x322E,0x6838, 0, 0, 0, 0, 0, 0, 0, 0,0x682E, 0,0x6836, 0,0x683D,0x6837, @@ -3760,7 +3760,7 @@ static uint16 tab_uni_jisx020840[]={ }; /* page 41 0x8C37-0x8D16 */ -static uint16 tab_uni_jisx020841[]={ +static const uint16 tab_uni_jisx020841[]={ 0x432B, 0, 0,0x6C2E, 0, 0, 0, 0, 0x6C30, 0,0x6C2F, 0, 0, 0, 0,0x4626, 0,0x6C31, 0,0x4B2D, 0,0x6C32, 0,0x6C33, @@ -3792,7 +3792,7 @@ static uint16 tab_uni_jisx020841[]={ }; /* page 42 0x8D64-0x8F64 */ -static uint16 tab_uni_jisx020842[]={ +static const uint16 tab_uni_jisx020842[]={ 0x4056, 0,0x3C4F,0x6C5F, 0, 0, 0,0x3352, 0,0x6C60, 0, 0,0x4176,0x6C61, 0,0x6C62, 0x496B, 0, 0,0x352F, 0, 0, 0, 0, @@ -3860,7 +3860,7 @@ static uint16 tab_uni_jisx020842[]={ 0x6D62}; /* page 43 0x8F9B-0x9132 */ -static uint16 tab_uni_jisx020843[]={ +static const uint16 tab_uni_jisx020843[]={ 0x3F49,0x6D63, 0,0x3C2D,0x6D64, 0, 0, 0, 0x6D65, 0, 0, 0,0x5221,0x517E, 0, 0, 0, 0,0x6D66,0x6570,0x6D67,0x4324,0x3F2B,0x4740, @@ -3915,7 +3915,7 @@ static uint16 tab_uni_jisx020843[]={ }; /* page 44 0x9149-0x92B9 */ -static uint16 tab_uni_jisx020844[]={ +static const uint16 tab_uni_jisx020844[]={ 0x4653,0x6E44,0x3D36,0x3C60,0x475B,0x4371, 0, 0, 0,0x3C72, 0,0x3F6C, 0,0x6E45, 0,0x6E46, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3965,7 +3965,7 @@ static uint16 tab_uni_jisx020844[]={ 0x6E78}; /* page 45 0x92CF-0x93E8 */ -static uint16 tab_uni_jisx020845[]={ +static const uint16 tab_uni_jisx020845[]={ 0x6E77, 0, 0,0x4B2F, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3D7B, 0, 0, @@ -4004,7 +4004,7 @@ static uint16 tab_uni_jisx020845[]={ 0,0x6F34}; /* page 46 0x9403-0x9481 */ -static uint16 tab_uni_jisx020846[]={ +static const uint16 tab_uni_jisx020846[]={ 0x6F3F, 0, 0, 0,0x6F40, 0, 0, 0, 0, 0, 0, 0, 0,0x6F41, 0, 0, 0x6F3E,0x6F3D, 0, 0, 0,0x3E62,0x462A,0x6F3C, @@ -4023,7 +4023,7 @@ static uint16 tab_uni_jisx020846[]={ 0,0x6F55,0x6F53,0x6F56,0x6F58, 0,0x6F57}; /* page 47 0x9577-0x95E5 */ -static uint16 tab_uni_jisx020847[]={ +static const uint16 tab_uni_jisx020847[]={ 0x4439, 0, 0, 0, 0, 0, 0, 0, 0,0x4C67, 0,0x6F59,0x412E, 0, 0, 0, 0x6F5A, 0,0x4A44,0x6F5B,0x332B, 0, 0, 0, @@ -4040,7 +4040,7 @@ static uint16 tab_uni_jisx020847[]={ 0, 0,0x6F71,0x6F73, 0, 0,0x6F72}; /* page 48 0x961C-0x9874 */ -static uint16 tab_uni_jisx020848[]={ +static const uint16 tab_uni_jisx020848[]={ 0x496C, 0, 0, 0, 0,0x6F74, 0, 0, 0, 0, 0, 0,0x6F75, 0,0x3A65, 0, 0, 0,0x6F76,0x6F77, 0, 0,0x4B49, 0, @@ -4119,14 +4119,14 @@ static uint16 tab_uni_jisx020848[]={ 0x7122}; /* page 49 0x98A8-0x98C6 */ -static uint16 tab_uni_jisx020849[]={ +static const uint16 tab_uni_jisx020849[]={ 0x4977, 0,0x7124, 0, 0, 0, 0,0x7125, 0,0x7126, 0, 0, 0, 0,0x7127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7129,0x7128, 0,0x712A}; /* page 50 0x98DB-0x9957 */ -static uint16 tab_uni_jisx020850[]={ +static const uint16 tab_uni_jisx020850[]={ 0x4874,0x664C, 0, 0,0x3F29, 0, 0,0x3532, 0, 0, 0, 0, 0, 0,0x712B, 0, 0x712C, 0,0x522C,0x5D3B,0x4853, 0, 0,0x307B, @@ -4145,7 +4145,7 @@ static uint16 tab_uni_jisx020850[]={ 0, 0,0x7143, 0,0x3642}; /* page 51 0x9996-0x9A6B */ -static uint16 tab_uni_jisx020851[]={ +static const uint16 tab_uni_jisx020851[]={ 0x3C73,0x7144,0x7145,0x3961, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7146, 0, 0,0x333E, 0, 0, 0,0x474F,0x7147, @@ -4175,7 +4175,7 @@ static uint16 tab_uni_jisx020851[]={ 0, 0, 0,0x7169,0x716B,0x716A}; /* page 52 0x9AA8-0x9B5A */ -static uint16 tab_uni_jisx020852[]={ +static const uint16 tab_uni_jisx020852[]={ 0x397C, 0, 0, 0, 0,0x716C, 0, 0, 0x716D, 0, 0, 0, 0, 0, 0, 0, 0x333C, 0, 0, 0,0x716E, 0, 0, 0, @@ -4201,7 +4201,7 @@ static uint16 tab_uni_jisx020852[]={ 0x7236, 0,0x357B}; /* page 53 0x9B6F-0x9C78 */ -static uint16 tab_uni_jisx020853[]={ +static const uint16 tab_uni_jisx020853[]={ 0x4F25, 0, 0, 0, 0,0x7237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7239, 0, 0, 0, @@ -4238,7 +4238,7 @@ static uint16 tab_uni_jisx020853[]={ 0,0x7269}; /* page 54 0x9CE5-0x9DFD */ -static uint16 tab_uni_jisx020854[]={ +static const uint16 tab_uni_jisx020854[]={ 0x443B, 0,0x726A, 0,0x4837, 0,0x726F,0x726B, 0, 0, 0,0x726C, 0, 0,0x4B31,0x4C44, 0,0x4650, 0, 0, 0, 0, 0, 0, @@ -4277,11 +4277,11 @@ static uint16 tab_uni_jisx020854[]={ 0x733F}; /* page 55 0x9E1A-0x9E1E */ -static uint16 tab_uni_jisx020855[]={ +static const uint16 tab_uni_jisx020855[]={ 0x7340,0x7341, 0, 0,0x7342}; /* page 56 0x9E75-0x9F77 */ -static uint16 tab_uni_jisx020856[]={ +static const uint16 tab_uni_jisx020856[]={ 0x7343, 0, 0,0x3834,0x7344, 0, 0, 0, 0x7345, 0,0x3C2F, 0,0x7346, 0, 0, 0, 0, 0, 0,0x7347, 0, 0,0x7348,0x7349, @@ -4317,13 +4317,13 @@ static uint16 tab_uni_jisx020856[]={ 0,0x737B,0x7379}; /* page 57 0x9F8D-0x9FA0 */ -static uint16 tab_uni_jisx020857[]={ +static const uint16 tab_uni_jisx020857[]={ 0x4E36, 0, 0, 0, 0, 0, 0, 0, 0x737C, 0, 0, 0, 0, 0, 0,0x737D, 0x6354, 0, 0,0x737E}; /* page 58 0xFF01-0xFF5E */ -static uint16 tab_uni_jisx020858[]={ +static const uint16 tab_uni_jisx020858[]={ 0x212A, 0,0x2174,0x2170,0x2173,0x2175, 0,0x214A, 0x214B,0x2176,0x215C,0x2124,0x215D,0x2125,0x213F,0x2330, 0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338, @@ -4338,7 +4338,7 @@ static uint16 tab_uni_jisx020858[]={ 0x2379,0x237A,0x2150,0x2143,0x2151,0x2141}; /* page 59 0xFFE0-0xFFE5 */ -static uint16 tab_uni_jisx020859[]={ +static const uint16 tab_uni_jisx020859[]={ 0x2171,0x2172,0x224C,0x2131, 0,0x216F}; static int @@ -4468,11 +4468,11 @@ my_uni_jisx0208_onechar(int code){ /* page 0 0x007E-0x007E */ -static uint16 tab_uni_jisx02120[]={ +static const uint16 tab_uni_jisx02120[]={ 0}; /* page 1 0x00A1-0x017E */ -static uint16 tab_uni_jisx02121[]={ +static const uint16 tab_uni_jisx02121[]={ 0x2242, 0, 0,0x2270, 0, 0, 0, 0, 0x226D,0x226C, 0, 0, 0,0x226E,0x2234, 0, 0, 0, 0, 0, 0, 0, 0,0x2231, @@ -4503,28 +4503,28 @@ static uint16 tab_uni_jisx02121[]={ 0x2A75,0x2B75,0x2A77,0x2B77,0x2A76,0x2B76}; /* page 2 0x01CD-0x01DC */ -static uint16 tab_uni_jisx02122[]={ +static const uint16 tab_uni_jisx02122[]={ 0x2A26,0x2B26,0x2A43,0x2B43,0x2A55,0x2B55,0x2A67,0x2B67, 0x2A70,0x2B70,0x2A6D,0x2B6D,0x2A6F,0x2B6F,0x2A6E,0x2B6E }; /* page 3 0x01F5-0x01F5 */ -static uint16 tab_uni_jisx02123[]={ +static const uint16 tab_uni_jisx02123[]={ 0x2B39}; /* page 4 0x02C7-0x02DD */ -static uint16 tab_uni_jisx02124[]={ +static const uint16 tab_uni_jisx02124[]={ 0x2230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x222F,0x2232,0x2236,0x2235, 0,0x2233}; /* page 5 0x0384-0x0390 */ -static uint16 tab_uni_jisx02125[]={ +static const uint16 tab_uni_jisx02125[]={ 0x2238,0x2239,0x2661, 0,0x2662,0x2663,0x2664, 0, 0x2667, 0,0x2669,0x266C,0x2676}; /* page 6 0x03AA-0x03CE */ -static uint16 tab_uni_jisx02126[]={ +static const uint16 tab_uni_jisx02126[]={ 0x2665,0x266A,0x2671,0x2672,0x2673,0x2674,0x267B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4532,26 +4532,26 @@ static uint16 tab_uni_jisx02126[]={ 0x2675,0x267A,0x2677,0x2679,0x267C}; /* page 7 0x0402-0x040F */ -static uint16 tab_uni_jisx02127[]={ +static const uint16 tab_uni_jisx02127[]={ 0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,0x2748,0x2749, 0x274A,0x274B,0x274C, 0,0x274D,0x274E}; /* page 8 0x0452-0x045F */ -static uint16 tab_uni_jisx02128[]={ +static const uint16 tab_uni_jisx02128[]={ 0x2772,0x2773,0x2774,0x2775,0x2776,0x2777,0x2778,0x2779, 0x277A,0x277B,0x277C, 0,0x277D,0x277E}; /* page 9 0x2122-0x2122 */ -static uint16 tab_uni_jisx02129[]={ +static const uint16 tab_uni_jisx02129[]={ 0x226F}; /* page 10 0x2170-0x2179 */ -static uint16 tab_uni_jisx021210[]={ +static const uint16 tab_uni_jisx021210[]={ 0x7373,0x7374,0x7375,0x7376,0x7377,0x7378,0x7379,0x737A, 0x737B,0x737C}; /* page 11 0x4E02-0x4F19 */ -static uint16 tab_uni_jisx021211[]={ +static const uint16 tab_uni_jisx021211[]={ 0x3021, 0,0x3022,0x3023, 0, 0, 0, 0, 0, 0,0x3024, 0, 0, 0, 0, 0, 0x3025, 0, 0, 0, 0, 0, 0, 0, @@ -4590,7 +4590,7 @@ static uint16 tab_uni_jisx021211[]={ }; /* page 12 0x4F2E-0x5166 */ -static uint16 tab_uni_jisx021212[]={ +static const uint16 tab_uni_jisx021212[]={ 0x305D, 0, 0,0x305E, 0,0x3060, 0,0x3061, 0,0x3062, 0,0x3063, 0,0x3064, 0, 0, 0x3065, 0,0x3066, 0,0x3067, 0, 0, 0, @@ -4665,7 +4665,7 @@ static uint16 tab_uni_jisx021212[]={ 0x326E}; /* page 13 0x517E-0x5515 */ -static uint16 tab_uni_jisx021213[]={ +static const uint16 tab_uni_jisx021213[]={ 0x326F, 0, 0, 0, 0,0x3270,0x3271, 0, 0, 0, 0, 0, 0,0x3272, 0, 0, 0x3273, 0, 0, 0, 0, 0, 0, 0, @@ -4784,7 +4784,7 @@ static uint16 tab_uni_jisx021213[]={ }; /* page 14 0x552A-0x5566 */ -static uint16 tab_uni_jisx021214[]={ +static const uint16 tab_uni_jisx021214[]={ 0x354E,0x354F, 0, 0, 0, 0, 0, 0, 0x3550, 0, 0,0x3551,0x3552, 0, 0, 0, 0,0x3553,0x3554,0x3555, 0, 0, 0,0x3556, @@ -4795,7 +4795,7 @@ static uint16 tab_uni_jisx021214[]={ 0, 0,0x3563, 0,0x3564}; /* page 15 0x557F-0x5C36 */ -static uint16 tab_uni_jisx021215[]={ +static const uint16 tab_uni_jisx021215[]={ 0x3565, 0,0x3566,0x3567, 0, 0, 0,0x3568, 0,0x3569, 0, 0, 0, 0, 0,0x356A, 0x356B, 0,0x356C,0x356D,0x356E,0x356F, 0, 0, @@ -5014,7 +5014,7 @@ static uint16 tab_uni_jisx021215[]={ }; /* page 16 0x5C59-0x5EEB */ -static uint16 tab_uni_jisx021216[]={ +static const uint16 tab_uni_jisx021216[]={ 0x3A77,0x3A78, 0,0x3A79, 0, 0, 0, 0, 0,0x3A7A,0x3A7B, 0, 0, 0,0x3A7C,0x3A7D, 0x3A7E, 0, 0, 0,0x3B21, 0, 0,0x3B22, @@ -5100,7 +5100,7 @@ static uint16 tab_uni_jisx021216[]={ 0, 0,0x3C5B}; /* page 17 0x5F02-0x6149 */ -static uint16 tab_uni_jisx021217[]={ +static const uint16 tab_uni_jisx021217[]={ 0x3C5C, 0, 0, 0,0x3C5D,0x3C5E,0x3C5F, 0, 0, 0, 0, 0,0x3C60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3C61, @@ -5177,7 +5177,7 @@ static uint16 tab_uni_jisx021217[]={ }; /* page 18 0x615E-0x6290 */ -static uint16 tab_uni_jisx021218[]={ +static const uint16 tab_uni_jisx021218[]={ 0x3E53, 0,0x3E54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3E55, 0, 0, 0, 0, 0,0x3E56, 0, 0, 0, @@ -5219,7 +5219,7 @@ static uint16 tab_uni_jisx021218[]={ 0x3F46,0x3F47,0x3F48}; /* page 19 0x62A6-0x679B */ -static uint16 tab_uni_jisx021219[]={ +static const uint16 tab_uni_jisx021219[]={ 0x3F49, 0,0x3F4A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3F4B, 0, 0, 0x3F4C,0x3F4D, 0, 0,0x3F4E, 0, 0, 0, @@ -5381,7 +5381,7 @@ static uint16 tab_uni_jisx021219[]={ 0x432D, 0,0x432E,0x432F, 0,0x4330}; /* page 20 0x67B0-0x6801 */ -static uint16 tab_uni_jisx021220[]={ +static const uint16 tab_uni_jisx021220[]={ 0x4331,0x4332,0x4333, 0, 0,0x4334, 0, 0, 0, 0, 0,0x4335,0x4336,0x4337, 0, 0, 0x4339, 0,0x433A,0x433B, 0,0x433C, 0, 0, @@ -5395,7 +5395,7 @@ static uint16 tab_uni_jisx021220[]={ 0,0x7446}; /* page 21 0x6814-0x6917 */ -static uint16 tab_uni_jisx021221[]={ +static const uint16 tab_uni_jisx021221[]={ 0x434A, 0, 0, 0, 0,0x434B, 0, 0, 0,0x434C, 0,0x434D, 0, 0, 0, 0, 0, 0, 0,0x434F,0x434E, 0, 0, 0, @@ -5431,7 +5431,7 @@ static uint16 tab_uni_jisx021221[]={ 0, 0,0x443B,0x443C}; /* page 22 0x6931-0x6D3F */ -static uint16 tab_uni_jisx021222[]={ +static const uint16 tab_uni_jisx021222[]={ 0x443D, 0,0x443E, 0,0x443F, 0, 0,0x4440, 0, 0,0x4441, 0, 0, 0, 0, 0, 0,0x4442, 0, 0,0x4443, 0, 0, 0, @@ -5564,7 +5564,7 @@ static uint16 tab_uni_jisx021222[]={ 0x473A, 0, 0,0x473B, 0, 0,0x473C}; /* page 23 0x6D57-0x6E04 */ -static uint16 tab_uni_jisx021223[]={ +static const uint16 tab_uni_jisx021223[]={ 0x473D, 0, 0, 0, 0, 0, 0,0x473E, 0x473F, 0,0x4740, 0, 0, 0,0x4741, 0, 0x4742, 0, 0, 0, 0, 0, 0, 0, @@ -5589,7 +5589,7 @@ static uint16 tab_uni_jisx021223[]={ 0,0x4767, 0, 0, 0,0x4768}; /* page 24 0x6E1E-0x6ECF */ -static uint16 tab_uni_jisx021224[]={ +static const uint16 tab_uni_jisx021224[]={ 0x4769, 0, 0, 0,0x476A, 0, 0, 0, 0,0x476B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x476C, 0, 0, 0, @@ -5615,7 +5615,7 @@ static uint16 tab_uni_jisx021224[]={ 0x4839,0x483A}; /* page 25 0x6EEB-0x70E4 */ -static uint16 tab_uni_jisx021225[]={ +static const uint16 tab_uni_jisx021225[]={ 0x483B, 0,0x483C,0x483D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x483E, 0, 0x483F, 0,0x4840, 0, 0, 0, 0, 0, @@ -5682,7 +5682,7 @@ static uint16 tab_uni_jisx021225[]={ 0,0x4960}; /* page 26 0x70FA-0x71DC */ -static uint16 tab_uni_jisx021226[]={ +static const uint16 tab_uni_jisx021226[]={ 0x4961, 0, 0, 0, 0, 0, 0, 0, 0,0x4962,0x4963,0x4964,0x4965,0x4966, 0, 0, 0,0x4967,0x4968, 0, 0,0x4969, 0, 0, @@ -5714,7 +5714,7 @@ static uint16 tab_uni_jisx021226[]={ 0x4A3A, 0,0x4A3B}; /* page 27 0x71F8-0x7E9E */ -static uint16 tab_uni_jisx021227[]={ +static const uint16 tab_uni_jisx021227[]={ 0x4A3C, 0, 0, 0, 0, 0,0x4A3D, 0, 0x4A3E, 0, 0, 0, 0, 0, 0,0x4A3F, 0x4A40,0x4A41, 0, 0, 0, 0, 0, 0, @@ -6122,7 +6122,7 @@ static uint16 tab_uni_jisx021227[]={ 0x5467, 0,0x5468, 0, 0,0x5469,0x546A}; /* page 28 0x7F3B-0x8044 */ -static uint16 tab_uni_jisx021228[]={ +static const uint16 tab_uni_jisx021228[]={ 0x546C,0x546B,0x546D,0x546E,0x546F, 0, 0, 0, 0x5470,0x5471, 0, 0,0x5472, 0, 0, 0, 0, 0, 0, 0,0x5473, 0, 0,0x5474, @@ -6159,7 +6159,7 @@ static uint16 tab_uni_jisx021228[]={ 0,0x5563}; /* page 29 0x8060-0x8362 */ -static uint16 tab_uni_jisx021229[]={ +static const uint16 tab_uni_jisx021229[]={ 0x5564, 0, 0, 0,0x5565, 0,0x5566, 0, 0, 0, 0, 0, 0,0x5567, 0, 0, 0,0x5568, 0, 0, 0,0x5569, 0, 0, @@ -6259,7 +6259,7 @@ static uint16 tab_uni_jisx021229[]={ 0, 0,0x745F}; /* page 30 0x8370-0x8419 */ -static uint16 tab_uni_jisx021230[]={ +static const uint16 tab_uni_jisx021230[]={ 0x577D, 0, 0, 0, 0, 0, 0, 0, 0x577E, 0, 0, 0, 0,0x5821, 0,0x5822, 0x5823, 0,0x5824, 0,0x5825, 0,0x5826, 0, @@ -6284,7 +6284,7 @@ static uint16 tab_uni_jisx021230[]={ 0,0x584B}; /* page 31 0x842F-0x8880 */ -static uint16 tab_uni_jisx021231[]={ +static const uint16 tab_uni_jisx021231[]={ 0x584D, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x584E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x584F, 0, @@ -6426,7 +6426,7 @@ static uint16 tab_uni_jisx021231[]={ 0,0x5C38}; /* page 32 0x8898-0x89BC */ -static uint16 tab_uni_jisx021232[]={ +static const uint16 tab_uni_jisx021232[]={ 0x5C39, 0,0x5C3A,0x5C3B,0x5C3C, 0, 0,0x5C3D, 0x5C3E, 0, 0, 0, 0, 0, 0, 0, 0x5C3F, 0,0x5C40, 0, 0, 0, 0, 0, @@ -6466,7 +6466,7 @@ static uint16 tab_uni_jisx021232[]={ 0, 0, 0, 0,0x5D33}; /* page 33 0x89D4-0x8B9F */ -static uint16 tab_uni_jisx021233[]={ +static const uint16 tab_uni_jisx021233[]={ 0x5D34,0x5D35,0x5D36,0x5D37,0x5D38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x5D39, 0, 0, 0,0x5D3A, 0,0x5D3B, @@ -6527,7 +6527,7 @@ static uint16 tab_uni_jisx021233[]={ 0x5E5F, 0,0x5E60,0x5E61}; /* page 34 0x8C38-0x8CA4 */ -static uint16 tab_uni_jisx021234[]={ +static const uint16 tab_uni_jisx021234[]={ 0x5E62,0x5E63, 0, 0, 0,0x5E64,0x5E65, 0, 0, 0, 0, 0, 0,0x5E66, 0,0x5E67, 0,0x5E68, 0,0x5E69, 0, 0, 0,0x5E6A, @@ -6544,7 +6544,7 @@ static uint16 tab_uni_jisx021234[]={ 0, 0, 0, 0,0x5F29}; /* page 35 0x8CB9-0x8D1B */ -static uint16 tab_uni_jisx021235[]={ +static const uint16 tab_uni_jisx021235[]={ 0x5F2A,0x5F2B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x5F2C,0x5F2D, 0, 0, 0x5F2E, 0,0x5F2F, 0, 0, 0,0x5F30, 0, @@ -6560,7 +6560,7 @@ static uint16 tab_uni_jisx021235[]={ 0, 0,0x5F45}; /* page 36 0x8D65-0x8F65 */ -static uint16 tab_uni_jisx021236[]={ +static const uint16 tab_uni_jisx021236[]={ 0x5F46, 0, 0, 0,0x5F47, 0, 0,0x5F48, 0,0x5F49, 0, 0, 0, 0, 0, 0, 0,0x7468, 0, 0, 0, 0, 0, 0, @@ -6628,7 +6628,7 @@ static uint16 tab_uni_jisx021236[]={ 0x612C}; /* page 37 0x8F9D-0x9484 */ -static uint16 tab_uni_jisx021237[]={ +static const uint16 tab_uni_jisx021237[]={ 0x612D, 0, 0,0x612E,0x612F, 0, 0,0x6130, 0x6131,0x6132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6789,7 +6789,7 @@ static uint16 tab_uni_jisx021237[]={ }; /* page 38 0x9578-0x95E6 */ -static uint16 tab_uni_jisx021238[]={ +static const uint16 tab_uni_jisx021238[]={ 0x657D,0x657E, 0, 0, 0, 0,0x6621, 0, 0, 0, 0, 0,0x6622, 0, 0, 0, 0x6623, 0, 0, 0,0x6624,0x6625,0x6626, 0, @@ -6806,7 +6806,7 @@ static uint16 tab_uni_jisx021238[]={ 0x6641, 0, 0, 0,0x6642, 0,0x6643}; /* page 39 0x961D-0x986C */ -static uint16 tab_uni_jisx021239[]={ +static const uint16 tab_uni_jisx021239[]={ 0x6644,0x6645, 0, 0, 0,0x6646, 0,0x6647, 0x6648,0x6649, 0, 0, 0, 0, 0,0x664A, 0, 0, 0, 0,0x664B, 0,0x664C, 0, @@ -6884,7 +6884,7 @@ static uint16 tab_uni_jisx021239[]={ }; /* page 40 0x98AB-0x98CC */ -static uint16 tab_uni_jisx021240[]={ +static const uint16 tab_uni_jisx021240[]={ 0x683A, 0,0x683B,0x683C, 0,0x683D, 0, 0, 0,0x683E, 0, 0,0x683F,0x6840, 0,0x6841, 0x6842, 0, 0, 0,0x6843, 0, 0,0x6844, @@ -6892,7 +6892,7 @@ static uint16 tab_uni_jisx021240[]={ 0,0x6847}; /* page 41 0x98E1-0x9960 */ -static uint16 tab_uni_jisx021241[]={ +static const uint16 tab_uni_jisx021241[]={ 0x6848, 0,0x6849, 0,0x684A,0x684B,0x684C, 0, 0,0x684D, 0, 0, 0, 0, 0, 0, 0, 0,0x684E, 0, 0,0x684F, 0, 0, @@ -6912,7 +6912,7 @@ static uint16 tab_uni_jisx021241[]={ }; /* page 42 0x999B-0x9A5D */ -static uint16 tab_uni_jisx021242[]={ +static const uint16 tab_uni_jisx021242[]={ 0x6877, 0,0x6878,0x747A,0x6879, 0, 0, 0, 0, 0, 0,0x687A, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x687B,0x687C,0x687D, @@ -6940,7 +6940,7 @@ static uint16 tab_uni_jisx021242[]={ 0, 0,0x6955}; /* page 43 0x9AAA-0x9C7B */ -static uint16 tab_uni_jisx021243[]={ +static const uint16 tab_uni_jisx021243[]={ 0x6956, 0,0x6957, 0,0x6958,0x6959, 0, 0, 0x695A, 0,0x695B,0x695C,0x695D, 0, 0,0x695E, 0,0x695F, 0, 0,0x6960,0x6961, 0,0x6962, @@ -7002,7 +7002,7 @@ static uint16 tab_uni_jisx021243[]={ 0,0x6B58}; /* page 44 0x9CE6-0x9E1D */ -static uint16 tab_uni_jisx021244[]={ +static const uint16 tab_uni_jisx021244[]={ 0x6B59, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x6B5A, 0, 0, 0, 0,0x6B5B, 0,0x6B5C, 0, 0, 0, 0, @@ -7045,7 +7045,7 @@ static uint16 tab_uni_jisx021244[]={ }; /* page 45 0x9E7A-0x9FA5 */ -static uint16 tab_uni_jisx021245[]={ +static const uint16 tab_uni_jisx021245[]={ 0x6C59,0x6C5A,0x6C5B, 0, 0, 0,0x6C5C, 0, 0x6C5D,0x6C5E,0x6C5F,0x6C60, 0,0x6C61, 0, 0, 0, 0, 0, 0,0x6C62,0x6C63, 0, 0, @@ -7086,15 +7086,15 @@ static uint16 tab_uni_jisx021245[]={ 0x6D61,0x6D62, 0,0x6D63}; /* page 46 0xF929-0xF929 */ -static uint16 tab_uni_jisx021246[]={ +static const uint16 tab_uni_jisx021246[]={ 0x7445}; /* page 47 0xF9DC-0xF9DC */ -static uint16 tab_uni_jisx021247[]={ +static const uint16 tab_uni_jisx021247[]={ 0x7472}; /* page 48 0xFA00-0xFA2D */ -static uint16 tab_uni_jisx021248[]={ +static const uint16 tab_uni_jisx021248[]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7434,0x7437, 0x7438,0x743D,0x7444,0x7447,0x7448,0x744E,0x744F,0x7453, @@ -7103,11 +7103,11 @@ static uint16 tab_uni_jisx021248[]={ 0x7470,0x7473,0x7477,0x7478,0x7479,0x747D}; /* page 49 0xFF00-0XFF07 */ -static uint16 tab_uni_jisx021249[]={ +static const uint16 tab_uni_jisx021249[]={ 0, 0,0x742A, 0, 0, 0, 0,0x7429}; /* page 50 0xFFE4-0xFFE4 */ -static uint16 tab_uni_jisx021250[]={ +static const uint16 tab_uni_jisx021250[]={ 0x2243}; static int @@ -7218,34 +7218,34 @@ my_uni_jisx0212_onechar(int code){ } /* page 0 0x222F-0x2244 */ -static uint16 tab_jisx0212_uni0[]={ +static const uint16 tab_jisx0212_uni0[]={ 0x02D8,0x02C7,0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA, 0xFF5E,0x0384,0x0385, 0, 0, 0, 0, 0, 0, 0, 0,0x00A1,0xFFE4,0x00BF}; /* page 1 0x226B-0x2271 */ -static uint16 tab_jisx0212_uni1[]={ +static const uint16 tab_jisx0212_uni1[]={ 0x00BA,0x00AA,0x00A9,0x00AE,0x2122,0x00A4,0x2116}; /* page 2 0x2661-0x267C */ -static uint16 tab_jisx0212_uni2[]={ +static const uint16 tab_jisx0212_uni2[]={ 0x0386,0x0388,0x0389,0x038A,0x03AA, 0,0x038C, 0, 0x038E,0x03AB, 0,0x038F, 0, 0, 0, 0, 0x03AC,0x03AD,0x03AE,0x03AF,0x03CA,0x0390,0x03CC,0x03C2, 0x03CD,0x03CB,0x03B0,0x03CE}; /* page 3 0x2742-0x274E */ -static uint16 tab_jisx0212_uni3[]={ +static const uint16 tab_jisx0212_uni3[]={ 0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409, 0x040A,0x040B,0x040C,0x040E,0x040F}; /* page 4 0x2772-0x277E */ -static uint16 tab_jisx0212_uni4[]={ +static const uint16 tab_jisx0212_uni4[]={ 0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459, 0x045A,0x045B,0x045C,0x045E,0x045F}; /* page 5 0x2921-0x2950 */ -static uint16 tab_jisx0212_uni5[]={ +static const uint16 tab_jisx0212_uni5[]={ 0x00C6,0x0110, 0,0x0126, 0,0x0132, 0,0x0141, 0x013F, 0,0x014A,0x00D8,0x0152, 0,0x0166,0x00DE, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7255,7 +7255,7 @@ static uint16 tab_jisx0212_uni5[]={ }; /* page 6 0x2A21-0x2A77 */ -static uint16 tab_jisx0212_uni6[]={ +static const uint16 tab_jisx0212_uni6[]={ 0x00C1,0x00C0,0x00C4,0x00C2,0x0102,0x01CD,0x0100,0x0104, 0x00C5,0x00C3,0x0106,0x0108,0x010C,0x00C7,0x010A,0x010E, 0x00C9,0x00C8,0x00CB,0x00CA,0x011A,0x0116,0x0112,0x0118, @@ -7269,7 +7269,7 @@ static uint16 tab_jisx0212_uni6[]={ 0x0174,0x00DD,0x0178,0x0176,0x0179,0x017D,0x017B}; /* page 7 0x2B21-0x2B77 */ -static uint16 tab_jisx0212_uni7[]={ +static const uint16 tab_jisx0212_uni7[]={ 0x00E1,0x00E0,0x00E4,0x00E2,0x0103,0x01CE,0x0101,0x0105, 0x00E5,0x00E3,0x0107,0x0109,0x010D,0x00E7,0x010B,0x010F, 0x00E9,0x00E8,0x00EB,0x00EA,0x011B,0x0117,0x0113,0x0119, @@ -7283,7 +7283,7 @@ static uint16 tab_jisx0212_uni7[]={ 0x0175,0x00FD,0x00FF,0x0177,0x017A,0x017E,0x017C}; /* page 8 0x3021-0x307E */ -static uint16 tab_jisx0212_uni8[]={ +static const uint16 tab_jisx0212_uni8[]={ 0x4E02,0x4E04,0x4E05,0x4E0C,0x4E12,0x4E1F,0x4E23,0x4E24, 0x4E28,0x4E2B,0x4E2E,0x4E2F,0x4E30,0x4E35,0x4E40,0x4E41, 0x4E44,0x4E47,0x4E51,0x4E5A,0x4E5C,0x4E63,0x4E68,0x4E69, @@ -7298,7 +7298,7 @@ static uint16 tab_jisx0212_uni8[]={ 0x4F7A,0x4F7D,0x4F7E,0x4F81,0x4F82,0x4F84}; /* page 9 0x3121-0x317E */ -static uint16 tab_jisx0212_uni9[]={ +static const uint16 tab_jisx0212_uni9[]={ 0x4F85,0x4F89,0x4F8A,0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93, 0x4F94,0x4F97,0x4F99,0x4F9A,0x4F9E,0x4F9F,0x4FB2,0x4FB7, 0x4FB9,0x4FBB,0x4FBC,0x4FBD,0x4FBE,0x4FC0,0x4FC1,0x4FC5, @@ -7313,7 +7313,7 @@ static uint16 tab_jisx0212_uni9[]={ 0x5084,0x5086,0x508A,0x508E,0x508F,0x5090}; /* page 10 0x3221-0x327E */ -static uint16 tab_jisx0212_uni10[]={ +static const uint16 tab_jisx0212_uni10[]={ 0x5092,0x5093,0x5094,0x5096,0x509B,0x509C,0x509E,0x509F, 0x50A0,0x50A1,0x50A2,0x50AA,0x50AF,0x50B0,0x50B9,0x50BA, 0x50BD,0x50C0,0x50C3,0x50C4,0x50C7,0x50CC,0x50CE,0x50D0, @@ -7328,7 +7328,7 @@ static uint16 tab_jisx0212_uni10[]={ 0x51B8,0x51BA,0x51BC,0x51BE,0x51BF,0x51C2}; /* page 11 0x3321-0x337E */ -static uint16 tab_jisx0212_uni11[]={ +static const uint16 tab_jisx0212_uni11[]={ 0x51C8,0x51CF,0x51D1,0x51D2,0x51D3,0x51D5,0x51D8,0x51DE, 0x51E2,0x51E5,0x51EE,0x51F2,0x51F3,0x51F4,0x51F7,0x5201, 0x5202,0x5205,0x5212,0x5213,0x5215,0x5216,0x5218,0x5222, @@ -7343,7 +7343,7 @@ static uint16 tab_jisx0212_uni11[]={ 0x52F6,0x52F7,0x5300,0x5303,0x530A,0x530B}; /* page 12 0x3421-0x347E */ -static uint16 tab_jisx0212_uni12[]={ +static const uint16 tab_jisx0212_uni12[]={ 0x530C,0x5311,0x5313,0x5318,0x531B,0x531C,0x531E,0x531F, 0x5325,0x5327,0x5328,0x5329,0x532B,0x532C,0x532D,0x5330, 0x5332,0x5335,0x533C,0x533D,0x533E,0x5342,0x534C,0x534B, @@ -7358,7 +7358,7 @@ static uint16 tab_jisx0212_uni12[]={ 0x5469,0x546B,0x546D,0x546E,0x5474,0x547F}; /* page 13 0x3521-0x357E */ -static uint16 tab_jisx0212_uni13[]={ +static const uint16 tab_jisx0212_uni13[]={ 0x5481,0x5483,0x5485,0x5488,0x5489,0x548D,0x5491,0x5495, 0x5496,0x549C,0x549F,0x54A1,0x54A6,0x54A7,0x54A9,0x54AA, 0x54AD,0x54AE,0x54B1,0x54B7,0x54B9,0x54BA,0x54BB,0x54BF, @@ -7373,7 +7373,7 @@ static uint16 tab_jisx0212_uni13[]={ 0x55C9,0x55CB,0x55CC,0x55CE,0x55D1,0x55D2}; /* page 14 0x3621-0x367E */ -static uint16 tab_jisx0212_uni14[]={ +static const uint16 tab_jisx0212_uni14[]={ 0x55D3,0x55D7,0x55D8,0x55DB,0x55DE,0x55E2,0x55E9,0x55F6, 0x55FF,0x5605,0x5608,0x560A,0x560D,0x560E,0x560F,0x5610, 0x5611,0x5612,0x5619,0x562C,0x5630,0x5633,0x5635,0x5637, @@ -7388,7 +7388,7 @@ static uint16 tab_jisx0212_uni14[]={ 0x56E6,0x56E7,0x56E8,0x56F1,0x56EB,0x56ED}; /* page 15 0x3721-0x377E */ -static uint16 tab_jisx0212_uni15[]={ +static const uint16 tab_jisx0212_uni15[]={ 0x56F6,0x56F7,0x5701,0x5702,0x5707,0x570A,0x570C,0x5711, 0x5715,0x571A,0x571B,0x571D,0x5720,0x5722,0x5723,0x5724, 0x5725,0x5729,0x572A,0x572C,0x572E,0x572F,0x5733,0x5734, @@ -7403,7 +7403,7 @@ static uint16 tab_jisx0212_uni15[]={ 0x57FF,0x5803,0x5804,0x5808,0x5809,0x57E1}; /* page 16 0x3821-0x387E */ -static uint16 tab_jisx0212_uni16[]={ +static const uint16 tab_jisx0212_uni16[]={ 0x580C,0x580D,0x581B,0x581E,0x581F,0x5820,0x5826,0x5827, 0x582D,0x5832,0x5839,0x583F,0x5849,0x584C,0x584D,0x584F, 0x5850,0x5855,0x585F,0x5861,0x5864,0x5867,0x5868,0x5878, @@ -7418,7 +7418,7 @@ static uint16 tab_jisx0212_uni16[]={ 0x595E,0x595F,0x5961,0x5963,0x596B,0x596D}; /* page 17 0x3921-0x397E */ -static uint16 tab_jisx0212_uni17[]={ +static const uint16 tab_jisx0212_uni17[]={ 0x596F,0x5972,0x5975,0x5976,0x5979,0x597B,0x597C,0x598B, 0x598C,0x598E,0x5992,0x5995,0x5997,0x599F,0x59A4,0x59A7, 0x59AD,0x59AE,0x59AF,0x59B0,0x59B3,0x59B7,0x59BA,0x59BC, @@ -7433,7 +7433,7 @@ static uint16 tab_jisx0212_uni17[]={ 0x5AB3,0x5AB5,0x5AB8,0x5ABA,0x5ABB,0x5ABF}; /* page 18 0x3A21-0x3A7E */ -static uint16 tab_jisx0212_uni18[]={ +static const uint16 tab_jisx0212_uni18[]={ 0x5AC4,0x5AC6,0x5AC8,0x5ACF,0x5ADA,0x5ADC,0x5AE0,0x5AE5, 0x5AEA,0x5AEE,0x5AF5,0x5AF6,0x5AFD,0x5B00,0x5B01,0x5B08, 0x5B17,0x5B34,0x5B19,0x5B1B,0x5B1D,0x5B21,0x5B25,0x5B2D, @@ -7448,7 +7448,7 @@ static uint16 tab_jisx0212_uni18[]={ 0x5C5C,0x5C62,0x5C63,0x5C67,0x5C68,0x5C69}; /* page 19 0x3B21-0x3B7E */ -static uint16 tab_jisx0212_uni19[]={ +static const uint16 tab_jisx0212_uni19[]={ 0x5C6D,0x5C70,0x5C74,0x5C75,0x5C7A,0x5C7B,0x5C7C,0x5C7D, 0x5C87,0x5C88,0x5C8A,0x5C8F,0x5C92,0x5C9D,0x5C9F,0x5CA0, 0x5CA2,0x5CA3,0x5CA6,0x5CAA,0x5CB2,0x5CB4,0x5CB5,0x5CBA, @@ -7463,7 +7463,7 @@ static uint16 tab_jisx0212_uni19[]={ 0x5DD0,0x5DCE,0x5DD8,0x5DD9,0x5DE0,0x5DE4}; /* page 20 0x3C21-0x3C7E */ -static uint16 tab_jisx0212_uni20[]={ +static const uint16 tab_jisx0212_uni20[]={ 0x5DE9,0x5DF8,0x5DF9,0x5E00,0x5E07,0x5E0D,0x5E12,0x5E14, 0x5E15,0x5E18,0x5E1F,0x5E20,0x5E2E,0x5E28,0x5E32,0x5E35, 0x5E3E,0x5E4B,0x5E50,0x5E49,0x5E51,0x5E56,0x5E58,0x5E5B, @@ -7478,7 +7478,7 @@ static uint16 tab_jisx0212_uni20[]={ 0x5F58,0x5F5B,0x5F60,0x5F63,0x5F64,0x5F67}; /* page 21 0x3D21-0x3D7E */ -static uint16 tab_jisx0212_uni21[]={ +static const uint16 tab_jisx0212_uni21[]={ 0x5F6F,0x5F72,0x5F74,0x5F75,0x5F78,0x5F7A,0x5F7D,0x5F7E, 0x5F89,0x5F8D,0x5F8F,0x5F96,0x5F9C,0x5F9D,0x5FA2,0x5FA7, 0x5FAB,0x5FA4,0x5FAC,0x5FAF,0x5FB0,0x5FB1,0x5FB8,0x5FC4, @@ -7493,7 +7493,7 @@ static uint16 tab_jisx0212_uni21[]={ 0x60A4,0x60A5,0x60A8,0x60B0,0x60B1,0x60B7}; /* page 22 0x3E21-0x3E7E */ -static uint16 tab_jisx0212_uni22[]={ +static const uint16 tab_jisx0212_uni22[]={ 0x60BB,0x60BE,0x60C2,0x60C4,0x60C8,0x60C9,0x60CA,0x60CB, 0x60CE,0x60CF,0x60D4,0x60D5,0x60D9,0x60DB,0x60DD,0x60DE, 0x60E2,0x60E5,0x60F2,0x60F5,0x60F8,0x60FC,0x60FD,0x6102, @@ -7508,7 +7508,7 @@ static uint16 tab_jisx0212_uni22[]={ 0x61DF,0x61E1,0x61E2,0x61E7,0x61E9,0x61E5}; /* page 23 0x3F21-0x3F7E */ -static uint16 tab_jisx0212_uni23[]={ +static const uint16 tab_jisx0212_uni23[]={ 0x61EC,0x61ED,0x61EF,0x6201,0x6203,0x6204,0x6207,0x6213, 0x6215,0x621C,0x6220,0x6222,0x6223,0x6227,0x6229,0x622B, 0x6239,0x623D,0x6242,0x6243,0x6244,0x6246,0x624C,0x6250, @@ -7523,7 +7523,7 @@ static uint16 tab_jisx0212_uni23[]={ 0x6366,0x636C,0x636D,0x6371,0x6374,0x6375}; /* page 24 0x4021-0x407E */ -static uint16 tab_jisx0212_uni24[]={ +static const uint16 tab_jisx0212_uni24[]={ 0x6378,0x637C,0x637D,0x637F,0x6382,0x6384,0x6387,0x638A, 0x6390,0x6394,0x6395,0x6399,0x639A,0x639E,0x63A4,0x63A6, 0x63AD,0x63AE,0x63AF,0x63BD,0x63C1,0x63C5,0x63C8,0x63CE, @@ -7538,7 +7538,7 @@ static uint16 tab_jisx0212_uni24[]={ 0x64A8,0x64AC,0x64B3,0x64BD,0x64BE,0x64BF}; /* page 25 0x4121-0x417E */ -static uint16 tab_jisx0212_uni25[]={ +static const uint16 tab_jisx0212_uni25[]={ 0x64C4,0x64C9,0x64CA,0x64CB,0x64CC,0x64CE,0x64D0,0x64D1, 0x64D5,0x64D7,0x64E4,0x64E5,0x64E9,0x64EA,0x64ED,0x64F0, 0x64F5,0x64F7,0x64FB,0x64FF,0x6501,0x6504,0x6508,0x6509, @@ -7553,7 +7553,7 @@ static uint16 tab_jisx0212_uni25[]={ 0x660D,0x6611,0x6612,0x6615,0x6616,0x661D}; /* page 26 0x4221-0x427E */ -static uint16 tab_jisx0212_uni26[]={ +static const uint16 tab_jisx0212_uni26[]={ 0x661E,0x6621,0x6622,0x6623,0x6624,0x6626,0x6629,0x662A, 0x662B,0x662C,0x662E,0x6630,0x6631,0x6633,0x6639,0x6637, 0x6640,0x6645,0x6646,0x664A,0x664C,0x6651,0x664E,0x6657, @@ -7568,7 +7568,7 @@ static uint16 tab_jisx0212_uni26[]={ 0x6747,0x6748,0x674C,0x6754,0x6755,0x675D}; /* page 27 0x4321-0x437E */ -static uint16 tab_jisx0212_uni27[]={ +static const uint16 tab_jisx0212_uni27[]={ 0x6766,0x676C,0x676E,0x6774,0x6776,0x677B,0x6781,0x6784, 0x678E,0x678F,0x6791,0x6793,0x6796,0x6798,0x6799,0x679B, 0x67B0,0x67B1,0x67B2,0x67B5,0x67BB,0x67BC,0x67BD,0x67F9, @@ -7583,7 +7583,7 @@ static uint16 tab_jisx0212_uni27[]={ 0x68B2,0x68BB,0x68C5,0x68C8,0x68CC,0x68CF}; /* page 28 0x4421-0x447E */ -static uint16 tab_jisx0212_uni28[]={ +static const uint16 tab_jisx0212_uni28[]={ 0x68D0,0x68D1,0x68D3,0x68D6,0x68D9,0x68DC,0x68DD,0x68E5, 0x68E8,0x68EA,0x68EB,0x68EC,0x68ED,0x68F0,0x68F1,0x68F5, 0x68F6,0x68FB,0x68FC,0x68FD,0x6906,0x6909,0x690A,0x6910, @@ -7598,7 +7598,7 @@ static uint16 tab_jisx0212_uni28[]={ 0x6A1D,0x6A20,0x6A24,0x6A28,0x6A30,0x6A32}; /* page 29 0x4521-0x457E */ -static uint16 tab_jisx0212_uni29[]={ +static const uint16 tab_jisx0212_uni29[]={ 0x6A34,0x6A37,0x6A3B,0x6A3E,0x6A3F,0x6A45,0x6A46,0x6A49, 0x6A4A,0x6A4E,0x6A50,0x6A51,0x6A52,0x6A55,0x6A56,0x6A5B, 0x6A64,0x6A67,0x6A6A,0x6A71,0x6A73,0x6A7E,0x6A81,0x6A83, @@ -7613,7 +7613,7 @@ static uint16 tab_jisx0212_uni29[]={ 0x6B67,0x6B6B,0x6B6E,0x6B70,0x6B75,0x6B7D}; /* page 30 0x4621-0x467E */ -static uint16 tab_jisx0212_uni30[]={ +static const uint16 tab_jisx0212_uni30[]={ 0x6B7E,0x6B82,0x6B85,0x6B97,0x6B9B,0x6B9F,0x6BA0,0x6BA2, 0x6BA3,0x6BA8,0x6BA9,0x6BAC,0x6BAD,0x6BAE,0x6BB0,0x6BB8, 0x6BB9,0x6BBD,0x6BBE,0x6BC3,0x6BC4,0x6BC9,0x6BCC,0x6BD6, @@ -7628,7 +7628,7 @@ static uint16 tab_jisx0212_uni30[]={ 0x6CCF,0x6CD0,0x6CD1,0x6CD2,0x6CD4,0x6CD6}; /* page 31 0x4721-0x477E */ -static uint16 tab_jisx0212_uni31[]={ +static const uint16 tab_jisx0212_uni31[]={ 0x6CDA,0x6CDC,0x6CE0,0x6CE7,0x6CE9,0x6CEB,0x6CEC,0x6CEE, 0x6CF2,0x6CF4,0x6D04,0x6D07,0x6D0A,0x6D0E,0x6D0F,0x6D11, 0x6D13,0x6D1A,0x6D26,0x6D27,0x6D28,0x6C67,0x6D2E,0x6D2F, @@ -7643,7 +7643,7 @@ static uint16 tab_jisx0212_uni31[]={ 0x6E53,0x6E54,0x6E57,0x6E5C,0x6E5D,0x6E5E}; /* page 32 0x4821-0x487E */ -static uint16 tab_jisx0212_uni32[]={ +static const uint16 tab_jisx0212_uni32[]={ 0x6E62,0x6E63,0x6E68,0x6E73,0x6E7B,0x6E7D,0x6E8D,0x6E93, 0x6E99,0x6EA0,0x6EA7,0x6EAD,0x6EAE,0x6EB1,0x6EB3,0x6EBB, 0x6EBF,0x6EC0,0x6EC1,0x6EC3,0x6EC7,0x6EC8,0x6ECA,0x6ECD, @@ -7658,7 +7658,7 @@ static uint16 tab_jisx0212_uni32[]={ 0x6FB6,0x6FBC,0x6FC5,0x6FC7,0x6FC8,0x6FCA}; /* page 33 0x4921-0x497E */ -static uint16 tab_jisx0212_uni33[]={ +static const uint16 tab_jisx0212_uni33[]={ 0x6FDA,0x6FDE,0x6FE8,0x6FE9,0x6FF0,0x6FF5,0x6FF9,0x6FFC, 0x6FFD,0x7000,0x7005,0x7006,0x7007,0x700D,0x7017,0x7020, 0x7023,0x702F,0x7034,0x7037,0x7039,0x703C,0x7043,0x7044, @@ -7673,7 +7673,7 @@ static uint16 tab_jisx0212_uni33[]={ 0x7152,0x7157,0x715A,0x715C,0x715E,0x7160}; /* page 34 0x4A21-0x4A7E */ -static uint16 tab_jisx0212_uni34[]={ +static const uint16 tab_jisx0212_uni34[]={ 0x7168,0x7179,0x7180,0x7185,0x7187,0x718C,0x7192,0x719A, 0x719B,0x71A0,0x71A2,0x71AF,0x71B0,0x71B2,0x71B3,0x71BA, 0x71BF,0x71C0,0x71C1,0x71C4,0x71CB,0x71CC,0x71D3,0x71D6, @@ -7688,7 +7688,7 @@ static uint16 tab_jisx0212_uni34[]={ 0x72DF,0x72E5,0x72F3,0x72F4,0x72FA,0x72FB}; /* page 35 0x4B21-0x4B7E */ -static uint16 tab_jisx0212_uni35[]={ +static const uint16 tab_jisx0212_uni35[]={ 0x72FE,0x7302,0x7304,0x7305,0x7307,0x730B,0x730D,0x7312, 0x7313,0x7318,0x7319,0x731E,0x7322,0x7324,0x7327,0x7328, 0x732C,0x7331,0x7332,0x7335,0x733A,0x733B,0x733D,0x7343, @@ -7703,7 +7703,7 @@ static uint16 tab_jisx0212_uni35[]={ 0x73F5,0x73F7,0x73F9,0x73FA,0x73FB,0x73FD}; /* page 36 0x4C21-0x4C7E */ -static uint16 tab_jisx0212_uni36[]={ +static const uint16 tab_jisx0212_uni36[]={ 0x73FF,0x7400,0x7401,0x7404,0x7407,0x740A,0x7411,0x741A, 0x741B,0x7424,0x7426,0x7428,0x7429,0x742A,0x742B,0x742C, 0x742D,0x742E,0x742F,0x7430,0x7431,0x7439,0x7440,0x7443, @@ -7718,7 +7718,7 @@ static uint16 tab_jisx0212_uni36[]={ 0x74F4,0x74FA,0x74FB,0x74FC,0x74FF,0x7506}; /* page 37 0x4D21-0x4D7E */ -static uint16 tab_jisx0212_uni37[]={ +static const uint16 tab_jisx0212_uni37[]={ 0x7512,0x7516,0x7517,0x7520,0x7521,0x7524,0x7527,0x7529, 0x752A,0x752F,0x7536,0x7539,0x753D,0x753E,0x753F,0x7540, 0x7543,0x7547,0x7548,0x754E,0x7550,0x7552,0x7557,0x755E, @@ -7733,7 +7733,7 @@ static uint16 tab_jisx0212_uni37[]={ 0x762D,0x7632,0x7633,0x7635,0x7638,0x7639}; /* page 38 0x4E21-0x4E7E */ -static uint16 tab_jisx0212_uni38[]={ +static const uint16 tab_jisx0212_uni38[]={ 0x763A,0x763C,0x764A,0x7640,0x7641,0x7643,0x7644,0x7645, 0x7649,0x764B,0x7655,0x7659,0x765F,0x7664,0x7665,0x766D, 0x766E,0x766F,0x7671,0x7674,0x7681,0x7685,0x768C,0x768D, @@ -7748,7 +7748,7 @@ static uint16 tab_jisx0212_uni38[]={ 0x7757,0x775C,0x775E,0x775F,0x7760,0x7762}; /* page 39 0x4F21-0x4F7E */ -static uint16 tab_jisx0212_uni39[]={ +static const uint16 tab_jisx0212_uni39[]={ 0x7764,0x7767,0x776A,0x776C,0x7770,0x7772,0x7773,0x7774, 0x777A,0x777D,0x7780,0x7784,0x778C,0x778D,0x7794,0x7795, 0x7796,0x779A,0x779F,0x77A2,0x77A7,0x77AA,0x77AE,0x77AF, @@ -7763,7 +7763,7 @@ static uint16 tab_jisx0212_uni39[]={ 0x78AC,0x78AD,0x78B0,0x78B1,0x78B2,0x78B3}; /* page 40 0x5021-0x507E */ -static uint16 tab_jisx0212_uni40[]={ +static const uint16 tab_jisx0212_uni40[]={ 0x78BB,0x78BD,0x78BF,0x78C7,0x78C8,0x78C9,0x78CC,0x78CE, 0x78D2,0x78D3,0x78D5,0x78D6,0x78E4,0x78DB,0x78DF,0x78E0, 0x78E1,0x78E6,0x78EA,0x78F2,0x78F3,0x7900,0x78F6,0x78F7, @@ -7778,7 +7778,7 @@ static uint16 tab_jisx0212_uni40[]={ 0x79CF,0x79D4,0x79D6,0x79DA,0x79DD,0x79DE}; /* page 41 0x5121-0x517E */ -static uint16 tab_jisx0212_uni41[]={ +static const uint16 tab_jisx0212_uni41[]={ 0x79E0,0x79E2,0x79E5,0x79EA,0x79EB,0x79ED,0x79F1,0x79F8, 0x79FC,0x7A02,0x7A03,0x7A07,0x7A09,0x7A0A,0x7A0C,0x7A11, 0x7A15,0x7A1B,0x7A1E,0x7A21,0x7A27,0x7A2B,0x7A2D,0x7A2F, @@ -7793,7 +7793,7 @@ static uint16 tab_jisx0212_uni41[]={ 0x7B2A,0x7B2B,0x7B2D,0x7B2E,0x7B2F,0x7B30}; /* page 42 0x5221-0x527E */ -static uint16 tab_jisx0212_uni42[]={ +static const uint16 tab_jisx0212_uni42[]={ 0x7B31,0x7B34,0x7B3D,0x7B3F,0x7B40,0x7B41,0x7B47,0x7B4E, 0x7B55,0x7B60,0x7B64,0x7B66,0x7B69,0x7B6A,0x7B6D,0x7B6F, 0x7B72,0x7B73,0x7B77,0x7B84,0x7B89,0x7B8E,0x7B90,0x7B91, @@ -7808,7 +7808,7 @@ static uint16 tab_jisx0212_uni42[]={ 0x7C59,0x7C5A,0x7C5B,0x7C5C,0x7C5D,0x7C5E}; /* page 43 0x5321-0x537E */ -static uint16 tab_jisx0212_uni43[]={ +static const uint16 tab_jisx0212_uni43[]={ 0x7C61,0x7C63,0x7C67,0x7C69,0x7C6D,0x7C6E,0x7C70,0x7C72, 0x7C79,0x7C7C,0x7C7D,0x7C86,0x7C87,0x7C8F,0x7C94,0x7C9E, 0x7CA0,0x7CA6,0x7CB0,0x7CB6,0x7CB7,0x7CBA,0x7CBB,0x7CBC, @@ -7823,7 +7823,7 @@ static uint16 tab_jisx0212_uni43[]={ 0x7D8C,0x7D8D,0x7D91,0x7D96,0x7D97,0x7D9D}; /* page 44 0x5421-0x547E */ -static uint16 tab_jisx0212_uni44[]={ +static const uint16 tab_jisx0212_uni44[]={ 0x7D9E,0x7DA6,0x7DA7,0x7DAA,0x7DB3,0x7DB6,0x7DB7,0x7DB9, 0x7DC2,0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DCC,0x7DCD,0x7DCE, 0x7DD7,0x7DD9,0x7E00,0x7DE2,0x7DE5,0x7DE6,0x7DEA,0x7DEB, @@ -7838,7 +7838,7 @@ static uint16 tab_jisx0212_uni44[]={ 0x7F61,0x7F63,0x7F64,0x7F65,0x7F66,0x7F6D}; /* page 45 0x5521-0x557E */ -static uint16 tab_jisx0212_uni45[]={ +static const uint16 tab_jisx0212_uni45[]={ 0x7F71,0x7F7D,0x7F7E,0x7F7F,0x7F80,0x7F8B,0x7F8D,0x7F8F, 0x7F90,0x7F91,0x7F96,0x7F97,0x7F9C,0x7FA1,0x7FA2,0x7FA6, 0x7FAA,0x7FAD,0x7FB4,0x7FBC,0x7FBF,0x7FC0,0x7FC3,0x7FC8, @@ -7853,7 +7853,7 @@ static uint16 tab_jisx0212_uni45[]={ 0x80D5,0x80D7,0x80D8,0x80E0,0x80ED,0x80EE}; /* page 46 0x5621-0x567E */ -static uint16 tab_jisx0212_uni46[]={ +static const uint16 tab_jisx0212_uni46[]={ 0x80F0,0x80F2,0x80F3,0x80F6,0x80F9,0x80FA,0x80FE,0x8103, 0x810B,0x8116,0x8117,0x8118,0x811C,0x811E,0x8120,0x8124, 0x8127,0x812C,0x8130,0x8135,0x813A,0x813C,0x8145,0x8147, @@ -7868,7 +7868,7 @@ static uint16 tab_jisx0212_uni46[]={ 0x8234,0x823A,0x8243,0x8244,0x8245,0x8246}; /* page 47 0x5721-0x577E */ -static uint16 tab_jisx0212_uni47[]={ +static const uint16 tab_jisx0212_uni47[]={ 0x824B,0x824E,0x824F,0x8251,0x8256,0x825C,0x8260,0x8263, 0x8267,0x826D,0x8274,0x827B,0x827D,0x827F,0x8280,0x8281, 0x8283,0x8284,0x8287,0x8289,0x828A,0x828E,0x8291,0x8294, @@ -7883,7 +7883,7 @@ static uint16 tab_jisx0212_uni47[]={ 0x8351,0x8355,0x8356,0x8357,0x8370,0x8378}; /* page 48 0x5821-0x587E */ -static uint16 tab_jisx0212_uni48[]={ +static const uint16 tab_jisx0212_uni48[]={ 0x837D,0x837F,0x8380,0x8382,0x8384,0x8386,0x838D,0x8392, 0x8394,0x8395,0x8398,0x8399,0x839B,0x839C,0x839D,0x83A6, 0x83A7,0x83A9,0x83AC,0x83BE,0x83BF,0x83C0,0x83C7,0x83C9, @@ -7898,7 +7898,7 @@ static uint16 tab_jisx0212_uni48[]={ 0x84C2,0x84C7,0x84C8,0x84CC,0x84CF,0x84D3}; /* page 49 0x5921-0x597E */ -static uint16 tab_jisx0212_uni49[]={ +static const uint16 tab_jisx0212_uni49[]={ 0x84DC,0x84E7,0x84EA,0x84EF,0x84F0,0x84F1,0x84F2,0x84F7, 0x8532,0x84FA,0x84FB,0x84FD,0x8502,0x8503,0x8507,0x850C, 0x850E,0x8510,0x851C,0x851E,0x8522,0x8523,0x8524,0x8525, @@ -7913,7 +7913,7 @@ static uint16 tab_jisx0212_uni49[]={ 0x85E6,0x85E8,0x85ED,0x85F3,0x85F6,0x85FC}; /* page 50 0x5A21-0x5A7E */ -static uint16 tab_jisx0212_uni50[]={ +static const uint16 tab_jisx0212_uni50[]={ 0x85FF,0x8600,0x8604,0x8605,0x860D,0x860E,0x8610,0x8611, 0x8612,0x8618,0x8619,0x861B,0x861E,0x8621,0x8627,0x8629, 0x8636,0x8638,0x863A,0x863C,0x863D,0x8640,0x8642,0x8646, @@ -7928,7 +7928,7 @@ static uint16 tab_jisx0212_uni50[]={ 0x8714,0x8719,0x871E,0x871F,0x8721,0x8723}; /* page 51 0x5B21-0x5B7E */ -static uint16 tab_jisx0212_uni51[]={ +static const uint16 tab_jisx0212_uni51[]={ 0x8728,0x872E,0x872F,0x8731,0x8732,0x8739,0x873A,0x873C, 0x873D,0x873E,0x8740,0x8743,0x8745,0x874D,0x8758,0x875D, 0x8761,0x8764,0x8765,0x876F,0x8771,0x8772,0x877B,0x8783, @@ -7943,7 +7943,7 @@ static uint16 tab_jisx0212_uni51[]={ 0x8828,0x882D,0x882E,0x8830,0x8832,0x8835}; /* page 52 0x5C21-0x5C7E */ -static uint16 tab_jisx0212_uni52[]={ +static const uint16 tab_jisx0212_uni52[]={ 0x883A,0x883C,0x8841,0x8843,0x8845,0x8848,0x8849,0x884A, 0x884B,0x884E,0x8851,0x8855,0x8856,0x8858,0x885A,0x885C, 0x885F,0x8860,0x8864,0x8869,0x8871,0x8879,0x887B,0x8880, @@ -7958,7 +7958,7 @@ static uint16 tab_jisx0212_uni52[]={ 0x896B,0x896E,0x8970,0x8973,0x8975,0x897A}; /* page 53 0x5D21-0x5D7E */ -static uint16 tab_jisx0212_uni53[]={ +static const uint16 tab_jisx0212_uni53[]={ 0x897B,0x897C,0x897D,0x8989,0x898D,0x8990,0x8994,0x8995, 0x899B,0x899C,0x899F,0x89A0,0x89A5,0x89B0,0x89B4,0x89B5, 0x89B6,0x89B7,0x89BC,0x89D4,0x89D5,0x89D6,0x89D7,0x89D8, @@ -7973,7 +7973,7 @@ static uint16 tab_jisx0212_uni53[]={ 0x8A9F,0x8AA7,0x8AA9,0x8AAE,0x8AAF,0x8AB3}; /* page 54 0x5E21-0x5E7E */ -static uint16 tab_jisx0212_uni54[]={ +static const uint16 tab_jisx0212_uni54[]={ 0x8AB6,0x8AB7,0x8ABB,0x8ABE,0x8AC3,0x8AC6,0x8AC8,0x8AC9, 0x8ACA,0x8AD1,0x8AD3,0x8AD4,0x8AD5,0x8AD7,0x8ADD,0x8ADF, 0x8AEC,0x8AF0,0x8AF4,0x8AF5,0x8AF6,0x8AFC,0x8AFF,0x8B05, @@ -7988,7 +7988,7 @@ static uint16 tab_jisx0212_uni54[]={ 0x8C73,0x8C75,0x8C76,0x8C7B,0x8C7E,0x8C86}; /* page 55 0x5F21-0x5F7E */ -static uint16 tab_jisx0212_uni55[]={ +static const uint16 tab_jisx0212_uni55[]={ 0x8C87,0x8C8B,0x8C90,0x8C92,0x8C93,0x8C99,0x8C9B,0x8C9C, 0x8CA4,0x8CB9,0x8CBA,0x8CC5,0x8CC6,0x8CC9,0x8CCB,0x8CCF, 0x8CD6,0x8CD5,0x8CD9,0x8CDD,0x8CE1,0x8CE8,0x8CEC,0x8CEF, @@ -8003,7 +8003,7 @@ static uint16 tab_jisx0212_uni55[]={ 0x8E11,0x8E14,0x8E16,0x8E20,0x8E21,0x8E22}; /* page 56 0x6021-0x607E */ -static uint16 tab_jisx0212_uni56[]={ +static const uint16 tab_jisx0212_uni56[]={ 0x8E23,0x8E26,0x8E27,0x8E31,0x8E33,0x8E36,0x8E37,0x8E38, 0x8E39,0x8E3D,0x8E40,0x8E41,0x8E4B,0x8E4D,0x8E4E,0x8E4F, 0x8E54,0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E61,0x8E62,0x8E69, @@ -8018,7 +8018,7 @@ static uint16 tab_jisx0212_uni56[]={ 0x8F35,0x8F36,0x8F37,0x8F3A,0x8F40,0x8F41}; /* page 57 0x6121-0x617E */ -static uint16 tab_jisx0212_uni57[]={ +static const uint16 tab_jisx0212_uni57[]={ 0x8F43,0x8F47,0x8F4F,0x8F51,0x8F52,0x8F53,0x8F54,0x8F55, 0x8F58,0x8F5D,0x8F5E,0x8F65,0x8F9D,0x8FA0,0x8FA1,0x8FA4, 0x8FA5,0x8FA6,0x8FB5,0x8FB6,0x8FB8,0x8FBE,0x8FC0,0x8FC1, @@ -8033,7 +8033,7 @@ static uint16 tab_jisx0212_uni57[]={ 0x90B4,0x90B6,0x90BD,0x90CC,0x90BE,0x90C3}; /* page 58 0x6221-0x627E */ -static uint16 tab_jisx0212_uni58[]={ +static const uint16 tab_jisx0212_uni58[]={ 0x90C4,0x90C5,0x90C7,0x90C8,0x90D5,0x90D7,0x90D8,0x90D9, 0x90DC,0x90DD,0x90DF,0x90E5,0x90D2,0x90F6,0x90EB,0x90EF, 0x90F0,0x90F4,0x90FE,0x90FF,0x9100,0x9104,0x9105,0x9106, @@ -8048,7 +8048,7 @@ static uint16 tab_jisx0212_uni58[]={ 0x91B3,0x91B6,0x91BB,0x91BC,0x91BD,0x91BF}; /* page 59 0x6321-0x637E */ -static uint16 tab_jisx0212_uni59[]={ +static const uint16 tab_jisx0212_uni59[]={ 0x91C2,0x91C3,0x91C5,0x91D3,0x91D4,0x91D7,0x91D9,0x91DA, 0x91DE,0x91E4,0x91E5,0x91E9,0x91EA,0x91EC,0x91ED,0x91EE, 0x91EF,0x91F0,0x91F1,0x91F7,0x91F9,0x91FB,0x91FD,0x9200, @@ -8063,7 +8063,7 @@ static uint16 tab_jisx0212_uni59[]={ 0x9289,0x928A,0x928D,0x928E,0x9292,0x9297}; /* page 60 0x6421-0x647E */ -static uint16 tab_jisx0212_uni60[]={ +static const uint16 tab_jisx0212_uni60[]={ 0x9299,0x929F,0x92A0,0x92A4,0x92A5,0x92A7,0x92A8,0x92AB, 0x92AF,0x92B2,0x92B6,0x92B8,0x92BA,0x92BB,0x92BC,0x92BD, 0x92BF,0x92C0,0x92C1,0x92C2,0x92C3,0x92C5,0x92C6,0x92C7, @@ -8078,7 +8078,7 @@ static uint16 tab_jisx0212_uni60[]={ 0x936F,0x9370,0x9371,0x9373,0x9374,0x9376}; /* page 61 0x6521-0x657E */ -static uint16 tab_jisx0212_uni61[]={ +static const uint16 tab_jisx0212_uni61[]={ 0x937A,0x937D,0x937F,0x9380,0x9381,0x9382,0x9388,0x938A, 0x938B,0x938D,0x938F,0x9392,0x9395,0x9398,0x939B,0x939E, 0x93A1,0x93A3,0x93A4,0x93A6,0x93A8,0x93AB,0x93B4,0x93B5, @@ -8093,7 +8093,7 @@ static uint16 tab_jisx0212_uni61[]={ 0x9471,0x9472,0x9484,0x9483,0x9578,0x9579}; /* page 62 0x6621-0x667E */ -static uint16 tab_jisx0212_uni62[]={ +static const uint16 tab_jisx0212_uni62[]={ 0x957E,0x9584,0x9588,0x958C,0x958D,0x958E,0x959D,0x959E, 0x959F,0x95A1,0x95A6,0x95A9,0x95AB,0x95AC,0x95B4,0x95B6, 0x95BA,0x95BD,0x95BF,0x95C6,0x95C8,0x95C9,0x95CB,0x95D0, @@ -8108,7 +8108,7 @@ static uint16 tab_jisx0212_uni62[]={ 0x96DF,0x96E9,0x96EF,0x96F1,0x96FA,0x9702}; /* page 63 0x6721-0x677E */ -static uint16 tab_jisx0212_uni63[]={ +static const uint16 tab_jisx0212_uni63[]={ 0x9703,0x9705,0x9709,0x971A,0x971B,0x971D,0x9721,0x9722, 0x9723,0x9728,0x9731,0x9733,0x9741,0x9743,0x974A,0x974E, 0x974F,0x9755,0x9757,0x9758,0x975A,0x975B,0x9763,0x9767, @@ -8123,7 +8123,7 @@ static uint16 tab_jisx0212_uni63[]={ 0x9816,0x981C,0x981E,0x9820,0x9823,0x9826}; /* page 64 0x6821-0x687E */ -static uint16 tab_jisx0212_uni64[]={ +static const uint16 tab_jisx0212_uni64[]={ 0x982B,0x982E,0x982F,0x9830,0x9832,0x9833,0x9835,0x9825, 0x983E,0x9844,0x9847,0x984A,0x9851,0x9852,0x9853,0x9856, 0x9857,0x9859,0x985A,0x9862,0x9863,0x9865,0x9866,0x986A, @@ -8138,7 +8138,7 @@ static uint16 tab_jisx0212_uni64[]={ 0x999F,0x99A6,0x99B0,0x99B1,0x99B2,0x99B5}; /* page 65 0x6921-0x697E */ -static uint16 tab_jisx0212_uni65[]={ +static const uint16 tab_jisx0212_uni65[]={ 0x99B9,0x99BA,0x99BD,0x99BF,0x99C3,0x99C9,0x99D3,0x99D4, 0x99D9,0x99DA,0x99DC,0x99DE,0x99E7,0x99EA,0x99EB,0x99EC, 0x99F0,0x99F4,0x99F5,0x99F9,0x99FD,0x99FE,0x9A02,0x9A03, @@ -8153,7 +8153,7 @@ static uint16 tab_jisx0212_uni65[]={ 0x9AFD,0x9AFF,0x9B00,0x9B01,0x9B02,0x9B03}; /* page 66 0x6A21-0x6A7E */ -static uint16 tab_jisx0212_uni66[]={ +static const uint16 tab_jisx0212_uni66[]={ 0x9B04,0x9B05,0x9B08,0x9B09,0x9B0B,0x9B0C,0x9B0D,0x9B0E, 0x9B10,0x9B12,0x9B16,0x9B19,0x9B1B,0x9B1C,0x9B20,0x9B26, 0x9B2B,0x9B2D,0x9B33,0x9B34,0x9B35,0x9B37,0x9B39,0x9B3A, @@ -8168,7 +8168,7 @@ static uint16 tab_jisx0212_uni66[]={ 0x9BEA,0x9BEB,0x9BEF,0x9BF3,0x9BF7,0x9BF8}; /* page 67 0x6B21-0x6B7E */ -static uint16 tab_jisx0212_uni67[]={ +static const uint16 tab_jisx0212_uni67[]={ 0x9BF9,0x9BFA,0x9BFD,0x9BFF,0x9C00,0x9C02,0x9C0B,0x9C0F, 0x9C11,0x9C16,0x9C18,0x9C19,0x9C1A,0x9C1C,0x9C1E,0x9C22, 0x9C23,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,0x9C31,0x9C35, @@ -8183,7 +8183,7 @@ static uint16 tab_jisx0212_uni67[]={ 0x9D6A,0x9D6B,0x9D70,0x9D76,0x9D77,0x9D7B}; /* page 68 0x6C21-0x6C7E */ -static uint16 tab_jisx0212_uni68[]={ +static const uint16 tab_jisx0212_uni68[]={ 0x9D7C,0x9D7E,0x9D83,0x9D84,0x9D86,0x9D8A,0x9D8D,0x9D8E, 0x9D92,0x9D93,0x9D95,0x9D96,0x9D97,0x9D98,0x9DA1,0x9DAA, 0x9DAC,0x9DAE,0x9DB1,0x9DB5,0x9DB9,0x9DBC,0x9DBF,0x9DC3, @@ -8198,7 +8198,7 @@ static uint16 tab_jisx0212_uni68[]={ 0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,0x9EF5}; /* page 69 0x6D21-0x6D63 */ -static uint16 tab_jisx0212_uni69[]={ +static const uint16 tab_jisx0212_uni69[]={ 0x9EF8,0x9EFF,0x9F02,0x9F03,0x9F09,0x9F0F,0x9F10,0x9F11, 0x9F12,0x9F14,0x9F16,0x9F17,0x9F19,0x9F1A,0x9F1B,0x9F1F, 0x9F22,0x9F26,0x9F2A,0x9F2B,0x9F2F,0x9F31,0x9F32,0x9F34, @@ -8210,12 +8210,12 @@ static uint16 tab_jisx0212_uni69[]={ 0x9FA2,0x9FA3,0x9FA5}; /* page 70 0x7371-0x737E IBM Kanji and Nonkanji */ -static uint16 tab_jisx0212_uni70[]={ +static const uint16 tab_jisx0212_uni70[]={ 0, 0,0x2170,0x2171,0x2172,0x2173,0x2174,0x2175, 0x2176,0x2177,0x2178,0x2179,0x2160,0x2161}; /* page 71 0x7421-0x747E IBM Kanji and Nonkanji*/ -static uint16 tab_jisx0212_uni71[]={ +static const uint16 tab_jisx0212_uni71[]={ 0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,0x2168,0x2169, 0xFF07,0xFF02,0x3231,0x2116,0x2121,0x70BB,0x4EFC,0x50F4, 0x51EC,0x5307,0x5324,0xFA0E,0x548A,0x5759,0xFA0F,0xFA10, @@ -8685,7 +8685,7 @@ static MY_CHARSET_HANDLER my_charset_handler= -CHARSET_INFO my_charset_eucjpms_japanese_ci= +struct charset_info_st my_charset_eucjpms_japanese_ci= { 97,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ @@ -8718,7 +8718,7 @@ CHARSET_INFO my_charset_eucjpms_japanese_ci= }; -CHARSET_INFO my_charset_eucjpms_bin= +struct charset_info_st my_charset_eucjpms_bin= { 98,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c index 64cf30e3673..3e30931f579 100644 --- a/strings/ctype-extra.c +++ b/strings/ctype-extra.c @@ -6,7 +6,7 @@ ./conf_to_src ../sql/share/charsets/ > FILE */ -/* Copyright (C) 2000-2007 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ #include <m_ctype.h> #ifdef HAVE_CHARSET_dec8 -uchar ctype_dec8_swedish_ci[] = { +static const uchar ctype_dec8_swedish_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -45,7 +45,7 @@ uchar ctype_dec8_swedish_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_dec8_swedish_ci[] = { +static const uchar to_lower_dec8_swedish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -64,7 +64,7 @@ uchar to_lower_dec8_swedish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_dec8_swedish_ci[] = { +static const uchar to_upper_dec8_swedish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -83,7 +83,7 @@ uchar to_upper_dec8_swedish_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_dec8_swedish_ci[] = { +static const uchar sort_order_dec8_swedish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -102,7 +102,7 @@ uchar sort_order_dec8_swedish_ci[] = { 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x5D,0xF7,0xD8,0x55,0x55,0x55,0x59,0x59,0xDE,0xFF }; -uint16 to_uni_dec8_swedish_ci[] = { +static const uint16 to_uni_dec8_swedish_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -140,7 +140,7 @@ uint16 to_uni_dec8_swedish_ci[] = { #endif #ifdef HAVE_CHARSET_cp850 -uchar ctype_cp850_general_ci[] = { +static const uchar ctype_cp850_general_ci[] = { 0x00, 0x20,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x30,0x30, 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x30,0x30,0x30,0x30,0x30, @@ -160,7 +160,7 @@ uchar ctype_cp850_general_ci[] = { 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 }; -uchar to_lower_cp850_general_ci[] = { +static const uchar to_lower_cp850_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -179,7 +179,7 @@ uchar to_lower_cp850_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp850_general_ci[] = { +static const uchar to_upper_cp850_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -198,7 +198,7 @@ uchar to_upper_cp850_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_cp850_general_ci[] = { +static const uchar sort_order_cp850_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -217,7 +217,7 @@ uchar sort_order_cp850_general_ci[] = { 0xED,0xF1,0xC1,0xFE,0xF6,0xE7,0xBF,0xBC,0xF0,0xE8,0xF7,0xF9,0xF3,0xF2,0xDF,0xE0 }; -uint16 to_uni_cp850_general_ci[] = { +static const uint16 to_uni_cp850_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -255,7 +255,7 @@ uint16 to_uni_cp850_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin1 -uchar ctype_latin1_german1_ci[] = { +static const uchar ctype_latin1_german1_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -275,7 +275,7 @@ uchar ctype_latin1_german1_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin1_german1_ci[] = { +static const uchar to_lower_latin1_german1_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -294,7 +294,7 @@ uchar to_lower_latin1_german1_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin1_german1_ci[] = { +static const uchar to_upper_latin1_german1_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -313,7 +313,7 @@ uchar to_upper_latin1_german1_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin1_german1_ci[] = { +static const uchar sort_order_latin1_german1_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -332,7 +332,7 @@ uchar sort_order_latin1_german1_ci[] = { 0xD0,0x4E,0x4F,0x4F,0x4F,0x4F,0x4F,0xF7,0x4F,0x55,0x55,0x55,0x55,0x59,0xDE,0xFF }; -uint16 to_uni_latin1_german1_ci[] = { +static const uint16 to_uni_latin1_german1_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -370,7 +370,7 @@ uint16 to_uni_latin1_german1_ci[] = { #endif #ifdef HAVE_CHARSET_hp8 -uchar ctype_hp8_english_ci[] = { +static const uchar ctype_hp8_english_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -390,7 +390,7 @@ uchar ctype_hp8_english_ci[] = { 0x10,0x10,0x20,0x20,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 }; -uchar to_lower_hp8_english_ci[] = { +static const uchar to_lower_hp8_english_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -409,7 +409,7 @@ uchar to_lower_hp8_english_ci[] = { 0xF1,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_hp8_english_ci[] = { +static const uchar to_upper_hp8_english_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -428,7 +428,7 @@ uchar to_upper_hp8_english_ci[] = { 0xF0,0xF0,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_hp8_english_ci[] = { +static const uchar sort_order_hp8_english_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -447,7 +447,7 @@ uchar sort_order_hp8_english_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_hp8_english_ci[] = { +static const uint16 to_uni_hp8_english_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -485,7 +485,7 @@ uint16 to_uni_hp8_english_ci[] = { #endif #ifdef HAVE_CHARSET_koi8r -uchar ctype_koi8r_general_ci[] = { +static const uchar ctype_koi8r_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -505,7 +505,7 @@ uchar ctype_koi8r_general_ci[] = { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 }; -uchar to_lower_koi8r_general_ci[] = { +static const uchar to_lower_koi8r_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -524,7 +524,7 @@ uchar to_lower_koi8r_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar to_upper_koi8r_general_ci[] = { +static const uchar to_upper_koi8r_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -543,7 +543,7 @@ uchar to_upper_koi8r_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_koi8r_general_ci[] = { +static const uchar sort_order_koi8r_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -562,7 +562,7 @@ uchar sort_order_koi8r_general_ci[] = { 0xEF,0xFF,0xF0,0xF1,0xF2,0xF3,0xE6,0xE1,0xFC,0xFB,0xE7,0xF8,0xFD,0xF9,0xF7,0xFA }; -uint16 to_uni_koi8r_general_ci[] = { +static const uint16 to_uni_koi8r_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -600,7 +600,7 @@ uint16 to_uni_koi8r_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin2 -uchar ctype_latin2_general_ci[] = { +static const uchar ctype_latin2_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -620,7 +620,7 @@ uchar ctype_latin2_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin2_general_ci[] = { +static const uchar to_lower_latin2_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -639,7 +639,7 @@ uchar to_lower_latin2_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin2_general_ci[] = { +static const uchar to_upper_latin2_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -658,7 +658,7 @@ uchar to_upper_latin2_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin2_general_ci[] = { +static const uchar sort_order_latin2_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -677,7 +677,7 @@ uchar sort_order_latin2_general_ci[] = { 0xFF,0x55,0x54,0x57,0x56,0x56,0x56,0xFF,0x5A,0x5F,0x5F,0x5F,0x5F,0x63,0x5E,0xFF }; -uint16 to_uni_latin2_general_ci[] = { +static const uint16 to_uni_latin2_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -715,7 +715,7 @@ uint16 to_uni_latin2_general_ci[] = { #endif #ifdef HAVE_CHARSET_swe7 -uchar ctype_swe7_swedish_ci[] = { +static const uchar ctype_swe7_swedish_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -735,7 +735,7 @@ uchar ctype_swe7_swedish_ci[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_swe7_swedish_ci[] = { +static const uchar to_lower_swe7_swedish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -754,7 +754,7 @@ uchar to_lower_swe7_swedish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_swe7_swedish_ci[] = { +static const uchar to_upper_swe7_swedish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -773,7 +773,7 @@ uchar to_upper_swe7_swedish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_swe7_swedish_ci[] = { +static const uchar sort_order_swe7_swedish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -792,7 +792,7 @@ uchar sort_order_swe7_swedish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_swe7_swedish_ci[] = { +static const uint16 to_uni_swe7_swedish_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -830,7 +830,7 @@ uint16 to_uni_swe7_swedish_ci[] = { #endif #ifdef HAVE_CHARSET_ascii -uchar ctype_ascii_general_ci[] = { +static const uchar ctype_ascii_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -850,7 +850,7 @@ uchar ctype_ascii_general_ci[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_ascii_general_ci[] = { +static const uchar to_lower_ascii_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -869,7 +869,7 @@ uchar to_lower_ascii_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_ascii_general_ci[] = { +static const uchar to_upper_ascii_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -888,7 +888,7 @@ uchar to_upper_ascii_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_ascii_general_ci[] = { +static const uchar sort_order_ascii_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -907,7 +907,7 @@ uchar sort_order_ascii_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_ascii_general_ci[] = { +static const uint16 to_uni_ascii_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -945,7 +945,7 @@ uint16 to_uni_ascii_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp1251 -uchar ctype_cp1251_bulgarian_ci[] = { +static const uchar ctype_cp1251_bulgarian_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -965,7 +965,7 @@ uchar ctype_cp1251_bulgarian_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_cp1251_bulgarian_ci[] = { +static const uchar to_lower_cp1251_bulgarian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -984,7 +984,7 @@ uchar to_lower_cp1251_bulgarian_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1251_bulgarian_ci[] = { +static const uchar to_upper_cp1251_bulgarian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1003,7 +1003,7 @@ uchar to_upper_cp1251_bulgarian_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar sort_order_cp1251_bulgarian_ci[] = { +static const uchar sort_order_cp1251_bulgarian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1022,7 +1022,7 @@ uchar sort_order_cp1251_bulgarian_ci[] = { 0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B }; -uint16 to_uni_cp1251_bulgarian_ci[] = { +static const uint16 to_uni_cp1251_bulgarian_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1060,7 +1060,7 @@ uint16 to_uni_cp1251_bulgarian_ci[] = { #endif #ifdef HAVE_CHARSET_latin1 -uchar ctype_latin1_danish_ci[] = { +static const uchar ctype_latin1_danish_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1080,7 +1080,7 @@ uchar ctype_latin1_danish_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin1_danish_ci[] = { +static const uchar to_lower_latin1_danish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1099,7 +1099,7 @@ uchar to_lower_latin1_danish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin1_danish_ci[] = { +static const uchar to_upper_latin1_danish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1118,7 +1118,7 @@ uchar to_upper_latin1_danish_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin1_danish_ci[] = { +static const uchar sort_order_latin1_danish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1137,7 +1137,7 @@ uchar sort_order_latin1_danish_ci[] = { 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x5C,0xF7,0x5C,0x55,0x55,0x55,0x59,0x59,0xDE,0xFF }; -uint16 to_uni_latin1_danish_ci[] = { +static const uint16 to_uni_latin1_danish_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1175,7 +1175,7 @@ uint16 to_uni_latin1_danish_ci[] = { #endif #ifdef HAVE_CHARSET_hebrew -uchar ctype_hebrew_general_ci[] = { +static const uchar ctype_hebrew_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1195,7 +1195,7 @@ uchar ctype_hebrew_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x20,0x20,0x00 }; -uchar to_lower_hebrew_general_ci[] = { +static const uchar to_lower_hebrew_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1214,7 +1214,7 @@ uchar to_lower_hebrew_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_hebrew_general_ci[] = { +static const uchar to_upper_hebrew_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1233,7 +1233,7 @@ uchar to_upper_hebrew_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_hebrew_general_ci[] = { +static const uchar sort_order_hebrew_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1252,7 +1252,7 @@ uchar sort_order_hebrew_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_hebrew_general_ci[] = { +static const uint16 to_uni_hebrew_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1290,7 +1290,7 @@ uint16 to_uni_hebrew_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin7 -uchar ctype_latin7_estonian_cs[] = { +static const uchar ctype_latin7_estonian_cs[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1310,7 +1310,7 @@ uchar ctype_latin7_estonian_cs[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin7_estonian_cs[] = { +static const uchar to_lower_latin7_estonian_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1329,7 +1329,7 @@ uchar to_lower_latin7_estonian_cs[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin7_estonian_cs[] = { +static const uchar to_upper_latin7_estonian_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1348,7 +1348,7 @@ uchar to_upper_latin7_estonian_cs[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin7_estonian_cs[] = { +static const uchar sort_order_latin7_estonian_cs[] = { 0x00,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x2E,0x2F,0x30,0x31,0x32,0x0A,0x0B, 0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, 0x2C,0x33,0x34,0x35,0x36,0x37,0x38,0x27,0x39,0x3A,0x3B,0x5D,0x3C,0x28,0x3D,0x3E, @@ -1367,7 +1367,7 @@ uchar sort_order_latin7_estonian_cs[] = { 0xDC,0xC3,0xC5,0xC9,0xCB,0xF3,0xF7,0x65,0xED,0xBD,0xD9,0xEB,0xF9,0xE2,0xE4,0x53 }; -uint16 to_uni_latin7_estonian_cs[] = { +static const uint16 to_uni_latin7_estonian_cs[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1405,7 +1405,7 @@ uint16 to_uni_latin7_estonian_cs[] = { #endif #ifdef HAVE_CHARSET_latin2 -uchar ctype_latin2_hungarian_ci[] = { +static const uchar ctype_latin2_hungarian_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1425,7 +1425,7 @@ uchar ctype_latin2_hungarian_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin2_hungarian_ci[] = { +static const uchar to_lower_latin2_hungarian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1444,7 +1444,7 @@ uchar to_lower_latin2_hungarian_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin2_hungarian_ci[] = { +static const uchar to_upper_latin2_hungarian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1463,7 +1463,7 @@ uchar to_upper_latin2_hungarian_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin2_hungarian_ci[] = { +static const uchar sort_order_latin2_hungarian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1482,7 +1482,7 @@ uchar sort_order_latin2_hungarian_ci[] = { 0xFF,0x62,0x63,0x64,0x66,0x67,0x67,0xFF,0x6D,0x77,0x75,0x78,0x78,0x7E,0x74,0xFF }; -uint16 to_uni_latin2_hungarian_ci[] = { +static const uint16 to_uni_latin2_hungarian_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1520,7 +1520,7 @@ uint16 to_uni_latin2_hungarian_ci[] = { #endif #ifdef HAVE_CHARSET_koi8u -uchar ctype_koi8u_general_ci[] = { +static const uchar ctype_koi8u_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1540,7 +1540,7 @@ uchar ctype_koi8u_general_ci[] = { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 }; -uchar to_lower_koi8u_general_ci[] = { +static const uchar to_lower_koi8u_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1559,7 +1559,7 @@ uchar to_lower_koi8u_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar to_upper_koi8u_general_ci[] = { +static const uchar to_upper_koi8u_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1578,7 +1578,7 @@ uchar to_upper_koi8u_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_koi8u_general_ci[] = { +static const uchar sort_order_koi8u_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1597,7 +1597,7 @@ uchar sort_order_koi8u_general_ci[] = { 0x94,0xA4,0x95,0x96,0x97,0x98,0x89,0x82,0xA1,0xA0,0x8A,0x9D,0xA2,0x9E,0x9C,0x9F }; -uint16 to_uni_koi8u_general_ci[] = { +static const uint16 to_uni_koi8u_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1635,7 +1635,7 @@ uint16 to_uni_koi8u_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp1251 -uchar ctype_cp1251_ukrainian_ci[] = { +static const uchar ctype_cp1251_ukrainian_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1655,7 +1655,7 @@ uchar ctype_cp1251_ukrainian_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_cp1251_ukrainian_ci[] = { +static const uchar to_lower_cp1251_ukrainian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1674,7 +1674,7 @@ uchar to_lower_cp1251_ukrainian_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1251_ukrainian_ci[] = { +static const uchar to_upper_cp1251_ukrainian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1693,7 +1693,7 @@ uchar to_upper_cp1251_ukrainian_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar sort_order_cp1251_ukrainian_ci[] = { +static const uchar sort_order_cp1251_ukrainian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1712,7 +1712,7 @@ uchar sort_order_cp1251_ukrainian_ci[] = { 0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xA0,0xA1,0xA2,0xA3,0xA4 }; -uint16 to_uni_cp1251_ukrainian_ci[] = { +static const uint16 to_uni_cp1251_ukrainian_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1750,7 +1750,7 @@ uint16 to_uni_cp1251_ukrainian_ci[] = { #endif #ifdef HAVE_CHARSET_greek -uchar ctype_greek_general_ci[] = { +static const uchar ctype_greek_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1770,7 +1770,7 @@ uchar ctype_greek_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 }; -uchar to_lower_greek_general_ci[] = { +static const uchar to_lower_greek_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1789,7 +1789,7 @@ uchar to_lower_greek_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_greek_general_ci[] = { +static const uchar to_upper_greek_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1808,7 +1808,7 @@ uchar to_upper_greek_general_ci[] = { 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xCF,0xD5,0xD9,0xFF }; -uchar sort_order_greek_general_ci[] = { +static const uchar sort_order_greek_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1827,7 +1827,7 @@ uchar sort_order_greek_general_ci[] = { 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xC9,0xD5,0xCF,0xD5,0xD9,0xFF }; -uint16 to_uni_greek_general_ci[] = { +static const uint16 to_uni_greek_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1865,7 +1865,7 @@ uint16 to_uni_greek_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp1250 -uchar ctype_cp1250_general_ci[] = { +static const uchar ctype_cp1250_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -1885,7 +1885,7 @@ uchar ctype_cp1250_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_cp1250_general_ci[] = { +static const uchar to_lower_cp1250_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1904,7 +1904,7 @@ uchar to_lower_cp1250_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1250_general_ci[] = { +static const uchar to_upper_cp1250_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1923,7 +1923,7 @@ uchar to_upper_cp1250_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_cp1250_general_ci[] = { +static const uchar sort_order_cp1250_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -1942,7 +1942,7 @@ uchar sort_order_cp1250_general_ci[] = { 0x47,0x53,0x53,0x55,0x55,0x55,0x55,0xF7,0x58,0x5C,0x5C,0x5C,0x5C,0x60,0x5B,0xFF }; -uint16 to_uni_cp1250_general_ci[] = { +static const uint16 to_uni_cp1250_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -1980,7 +1980,7 @@ uint16 to_uni_cp1250_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin2 -uchar ctype_latin2_croatian_ci[] = { +static const uchar ctype_latin2_croatian_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2000,7 +2000,7 @@ uchar ctype_latin2_croatian_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin2_croatian_ci[] = { +static const uchar to_lower_latin2_croatian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2019,7 +2019,7 @@ uchar to_lower_latin2_croatian_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin2_croatian_ci[] = { +static const uchar to_upper_latin2_croatian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2038,7 +2038,7 @@ uchar to_upper_latin2_croatian_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin2_croatian_ci[] = { +static const uchar sort_order_latin2_croatian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2057,7 +2057,7 @@ uchar sort_order_latin2_croatian_ci[] = { 0x4A,0x57,0x57,0x59,0x59,0x59,0x59,0xFE,0x5D,0x64,0x64,0x64,0x64,0x69,0x62,0xFF }; -uint16 to_uni_latin2_croatian_ci[] = { +static const uint16 to_uni_latin2_croatian_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2095,7 +2095,7 @@ uint16 to_uni_latin2_croatian_ci[] = { #endif #ifdef HAVE_CHARSET_cp1257 -uchar ctype_cp1257_lithuanian_ci[] = { +static const uchar ctype_cp1257_lithuanian_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2115,7 +2115,7 @@ uchar ctype_cp1257_lithuanian_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 }; -uchar to_lower_cp1257_lithuanian_ci[] = { +static const uchar to_lower_cp1257_lithuanian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2134,7 +2134,7 @@ uchar to_lower_cp1257_lithuanian_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1257_lithuanian_ci[] = { +static const uchar to_upper_cp1257_lithuanian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2153,7 +2153,7 @@ uchar to_upper_cp1257_lithuanian_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_cp1257_lithuanian_ci[] = { +static const uchar sort_order_cp1257_lithuanian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2172,7 +2172,7 @@ uchar sort_order_cp1257_lithuanian_ci[] = { 0x5A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x5E,0xFF,0xFF,0x5D,0xFF,0xFF,0xFF,0xFF }; -uint16 to_uni_cp1257_lithuanian_ci[] = { +static const uint16 to_uni_cp1257_lithuanian_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2210,7 +2210,7 @@ uint16 to_uni_cp1257_lithuanian_ci[] = { #endif #ifdef HAVE_CHARSET_latin5 -uchar ctype_latin5_turkish_ci[] = { +static const uchar ctype_latin5_turkish_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2230,7 +2230,7 @@ uchar ctype_latin5_turkish_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin5_turkish_ci[] = { +static const uchar to_lower_latin5_turkish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2249,7 +2249,7 @@ uchar to_lower_latin5_turkish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin5_turkish_ci[] = { +static const uchar to_upper_latin5_turkish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2268,7 +2268,7 @@ uchar to_upper_latin5_turkish_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0x49,0xDE,0xFF }; -uchar sort_order_latin5_turkish_ci[] = { +static const uchar sort_order_latin5_turkish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2287,7 +2287,7 @@ uchar sort_order_latin5_turkish_ci[] = { 0x49,0x51,0x52,0x52,0x52,0x52,0x53,0xFA,0x52,0x5A,0x5A,0x5A,0x5B,0x4B,0x58,0x5F }; -uint16 to_uni_latin5_turkish_ci[] = { +static const uint16 to_uni_latin5_turkish_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2325,7 +2325,7 @@ uint16 to_uni_latin5_turkish_ci[] = { #endif #ifdef HAVE_CHARSET_armscii8 -uchar ctype_armscii8_general_ci[] = { +static const uchar ctype_armscii8_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2345,7 +2345,7 @@ uchar ctype_armscii8_general_ci[] = { 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x10,0x10 }; -uchar to_lower_armscii8_general_ci[] = { +static const uchar to_lower_armscii8_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2364,7 +2364,7 @@ uchar to_lower_armscii8_general_ci[] = { 0xF1,0xF1,0xF3,0xF3,0xF5,0xF5,0xF7,0xF7,0xF9,0xF9,0xFB,0xFB,0xFD,0xFD,0xFE,0xFF }; -uchar to_upper_armscii8_general_ci[] = { +static const uchar to_upper_armscii8_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2383,7 +2383,7 @@ uchar to_upper_armscii8_general_ci[] = { 0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFE,0xFF }; -uchar sort_order_armscii8_general_ci[] = { +static const uchar sort_order_armscii8_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2402,7 +2402,7 @@ uchar sort_order_armscii8_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_armscii8_general_ci[] = { +static const uint16 to_uni_armscii8_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2440,7 +2440,7 @@ uint16 to_uni_armscii8_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp866 -uchar ctype_cp866_general_ci[] = { +static const uchar ctype_cp866_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2460,7 +2460,7 @@ uchar ctype_cp866_general_ci[] = { 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48 }; -uchar to_lower_cp866_general_ci[] = { +static const uchar to_lower_cp866_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2479,7 +2479,7 @@ uchar to_lower_cp866_general_ci[] = { 0xF1,0xF1,0xF3,0xF3,0xF5,0xF5,0xF7,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp866_general_ci[] = { +static const uchar to_upper_cp866_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2498,7 +2498,7 @@ uchar to_upper_cp866_general_ci[] = { 0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_cp866_general_ci[] = { +static const uchar sort_order_cp866_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2517,7 +2517,7 @@ uchar sort_order_cp866_general_ci[] = { 0x81,0x81,0x83,0x83,0x8B,0x8B,0xA3,0xA3,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2 }; -uint16 to_uni_cp866_general_ci[] = { +static const uint16 to_uni_cp866_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2555,7 +2555,7 @@ uint16 to_uni_cp866_general_ci[] = { #endif #ifdef HAVE_CHARSET_keybcs2 -uchar ctype_keybcs2_general_ci[] = { +static const uchar ctype_keybcs2_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2575,7 +2575,7 @@ uchar ctype_keybcs2_general_ci[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48 }; -uchar to_lower_keybcs2_general_ci[] = { +static const uchar to_lower_keybcs2_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2594,7 +2594,7 @@ uchar to_lower_keybcs2_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_keybcs2_general_ci[] = { +static const uchar to_upper_keybcs2_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2613,7 +2613,7 @@ uchar to_upper_keybcs2_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_keybcs2_general_ci[] = { +static const uchar sort_order_keybcs2_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2632,7 +2632,7 @@ uchar sort_order_keybcs2_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_keybcs2_general_ci[] = { +static const uint16 to_uni_keybcs2_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2670,7 +2670,7 @@ uint16 to_uni_keybcs2_general_ci[] = { #endif #ifdef HAVE_CHARSET_macce -uchar ctype_macce_general_ci[] = { +static const uchar ctype_macce_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2690,7 +2690,7 @@ uchar ctype_macce_general_ci[] = { 0x02,0x01,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x02,0x01,0x01,0x02,0x01,0x00 }; -uchar to_lower_macce_general_ci[] = { +static const uchar to_lower_macce_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2709,7 +2709,7 @@ uchar to_lower_macce_general_ci[] = { 0xF0,0xF3,0x9C,0xF3,0xF5,0xF5,0xF7,0xF7,0xF9,0xF9,0xFA,0xFD,0xB8,0xFD,0xAE,0xFF }; -uchar to_upper_macce_general_ci[] = { +static const uchar to_upper_macce_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2728,7 +2728,7 @@ uchar to_upper_macce_general_ci[] = { 0xED,0xF1,0xF2,0xF1,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xB5,0xFB,0xFC,0xFB,0xFE,0xFF }; -uchar sort_order_macce_general_ci[] = { +static const uchar sort_order_macce_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2747,7 +2747,7 @@ uchar sort_order_macce_general_ci[] = { 0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x8B,0x8B,0x5B,0x8D,0x5D,0x8D,0x53,0xFF }; -uint16 to_uni_macce_general_ci[] = { +static const uint16 to_uni_macce_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2785,7 +2785,7 @@ uint16 to_uni_macce_general_ci[] = { #endif #ifdef HAVE_CHARSET_macroman -uchar ctype_macroman_general_ci[] = { +static const uchar ctype_macroman_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2805,7 +2805,7 @@ uchar ctype_macroman_general_ci[] = { 0x00,0x01,0x01,0x01,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_macroman_general_ci[] = { +static const uchar to_lower_macroman_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2824,7 +2824,7 @@ uchar to_lower_macroman_general_ci[] = { 0xF0,0x98,0x9C,0x9E,0x9D,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_macroman_general_ci[] = { +static const uchar to_upper_macroman_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2843,7 +2843,7 @@ uchar to_upper_macroman_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_macroman_general_ci[] = { +static const uchar sort_order_macroman_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2862,7 +2862,7 @@ uchar sort_order_macroman_general_ci[] = { 0xF0,0x72,0x85,0x85,0x85,0x61,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_macroman_general_ci[] = { +static const uint16 to_uni_macroman_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -2900,7 +2900,7 @@ uint16 to_uni_macroman_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp852 -uchar ctype_cp852_general_ci[] = { +static const uchar ctype_cp852_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -2920,7 +2920,7 @@ uchar ctype_cp852_general_ci[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x02,0x00,0x48 }; -uchar to_lower_cp852_general_ci[] = { +static const uchar to_lower_cp852_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2939,7 +2939,7 @@ uchar to_lower_cp852_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp852_general_ci[] = { +static const uchar to_upper_cp852_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2958,7 +2958,7 @@ uchar to_upper_cp852_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF }; -uchar sort_order_cp852_general_ci[] = { +static const uchar sort_order_cp852_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -2977,7 +2977,7 @@ uchar sort_order_cp852_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0x74,0x69,0x69,0xFE,0xFF }; -uint16 to_uni_cp852_general_ci[] = { +static const uint16 to_uni_cp852_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3015,7 +3015,7 @@ uint16 to_uni_cp852_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin7 -uchar ctype_latin7_general_ci[] = { +static const uchar ctype_latin7_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3035,7 +3035,7 @@ uchar ctype_latin7_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin7_general_ci[] = { +static const uchar to_lower_latin7_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3054,7 +3054,7 @@ uchar to_lower_latin7_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin7_general_ci[] = { +static const uchar to_upper_latin7_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3073,7 +3073,7 @@ uchar to_upper_latin7_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin7_general_ci[] = { +static const uchar sort_order_latin7_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x30,0x32,0x33,0x34,0x35,0x36,0x37,0x2B,0x38,0x39,0x3A,0x5C,0x3B,0x2C,0x3C,0x3D, @@ -3092,7 +3092,7 @@ uchar sort_order_latin7_general_ci[] = { 0xE1,0xC4,0xC6,0xCA,0xCE,0xD0,0xCC,0x64,0xEC,0xBC,0xDE,0xEA,0xE8,0xFA,0xFC,0x52 }; -uint16 to_uni_latin7_general_ci[] = { +static const uint16 to_uni_latin7_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3130,7 +3130,7 @@ uint16 to_uni_latin7_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin7 -uchar ctype_latin7_general_cs[] = { +static const uchar ctype_latin7_general_cs[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3150,7 +3150,7 @@ uchar ctype_latin7_general_cs[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin7_general_cs[] = { +static const uchar to_lower_latin7_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3169,7 +3169,7 @@ uchar to_lower_latin7_general_cs[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin7_general_cs[] = { +static const uchar to_upper_latin7_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3188,7 +3188,7 @@ uchar to_upper_latin7_general_cs[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin7_general_cs[] = { +static const uchar sort_order_latin7_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x30,0x32,0x33,0x34,0x35,0x36,0x37,0x2B,0x38,0x39,0x3A,0x5C,0x3B,0x2C,0x3C,0x3D, @@ -3207,7 +3207,7 @@ uchar sort_order_latin7_general_cs[] = { 0xE2,0xC5,0xC7,0xCB,0xCF,0xD1,0xCD,0x64,0xED,0xBD,0xDF,0xEB,0xE9,0xFB,0xFD,0x52 }; -uint16 to_uni_latin7_general_cs[] = { +static const uint16 to_uni_latin7_general_cs[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3245,7 +3245,7 @@ uint16 to_uni_latin7_general_cs[] = { #endif #ifdef HAVE_CHARSET_macce -uchar ctype_macce_bin[] = { +static const uchar ctype_macce_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3265,7 +3265,7 @@ uchar ctype_macce_bin[] = { 0x02,0x01,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x02,0x01,0x01,0x02,0x01,0x00 }; -uchar to_lower_macce_bin[] = { +static const uchar to_lower_macce_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3284,7 +3284,7 @@ uchar to_lower_macce_bin[] = { 0xF0,0xF3,0x9C,0xF3,0xF5,0xF5,0xF7,0xF7,0xF9,0xF9,0xFA,0xFD,0xB8,0xFD,0xAE,0xFF }; -uchar to_upper_macce_bin[] = { +static const uchar to_upper_macce_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3303,7 +3303,7 @@ uchar to_upper_macce_bin[] = { 0xED,0xF1,0xF2,0xF1,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xB5,0xFB,0xFC,0xFB,0xFE,0xFF }; -uint16 to_uni_macce_bin[] = { +static const uint16 to_uni_macce_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3341,7 +3341,7 @@ uint16 to_uni_macce_bin[] = { #endif #ifdef HAVE_CHARSET_cp1250 -uchar ctype_cp1250_croatian_ci[] = { +static const uchar ctype_cp1250_croatian_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3361,7 +3361,7 @@ uchar ctype_cp1250_croatian_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_cp1250_croatian_ci[] = { +static const uchar to_lower_cp1250_croatian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3380,7 +3380,7 @@ uchar to_lower_cp1250_croatian_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1250_croatian_ci[] = { +static const uchar to_upper_cp1250_croatian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3399,7 +3399,7 @@ uchar to_upper_cp1250_croatian_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_cp1250_croatian_ci[] = { +static const uchar sort_order_cp1250_croatian_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3418,7 +3418,7 @@ uchar sort_order_cp1250_croatian_ci[] = { 0x4A,0x57,0x57,0x59,0x59,0x59,0x59,0xC9,0x5D,0x64,0x64,0x64,0x64,0x69,0x62,0xFF }; -uint16 to_uni_cp1250_croatian_ci[] = { +static const uint16 to_uni_cp1250_croatian_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3456,7 +3456,7 @@ uint16 to_uni_cp1250_croatian_ci[] = { #endif #ifdef HAVE_CHARSET_latin1 -uchar ctype_latin1_general_ci[] = { +static const uchar ctype_latin1_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3476,7 +3476,7 @@ uchar ctype_latin1_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin1_general_ci[] = { +static const uchar to_lower_latin1_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3495,7 +3495,7 @@ uchar to_lower_latin1_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin1_general_ci[] = { +static const uchar to_upper_latin1_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3514,7 +3514,7 @@ uchar to_upper_latin1_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin1_general_ci[] = { +static const uchar sort_order_latin1_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3533,7 +3533,7 @@ uchar sort_order_latin1_general_ci[] = { 0x59,0x7F,0x83,0x85,0x87,0x89,0x8B,0xBE,0x8D,0x9C,0x9E,0xA0,0xA2,0xAC,0xB1,0xAE }; -uint16 to_uni_latin1_general_ci[] = { +static const uint16 to_uni_latin1_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3571,7 +3571,7 @@ uint16 to_uni_latin1_general_ci[] = { #endif #ifdef HAVE_CHARSET_latin1 -uchar ctype_latin1_general_cs[] = { +static const uchar ctype_latin1_general_cs[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3591,7 +3591,7 @@ uchar ctype_latin1_general_cs[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin1_general_cs[] = { +static const uchar to_lower_latin1_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3610,7 +3610,7 @@ uchar to_lower_latin1_general_cs[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin1_general_cs[] = { +static const uchar to_upper_latin1_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3629,7 +3629,7 @@ uchar to_upper_latin1_general_cs[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin1_general_cs[] = { +static const uchar sort_order_latin1_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3648,7 +3648,7 @@ uchar sort_order_latin1_general_cs[] = { 0x5A,0x80,0x84,0x86,0x88,0x8A,0x8C,0xBE,0x8E,0x9D,0x9F,0xA1,0xA3,0xAD,0xB2,0xAE }; -uint16 to_uni_latin1_general_cs[] = { +static const uint16 to_uni_latin1_general_cs[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3686,7 +3686,7 @@ uint16 to_uni_latin1_general_cs[] = { #endif #ifdef HAVE_CHARSET_cp1251 -uchar ctype_cp1251_bin[] = { +static const uchar ctype_cp1251_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3706,7 +3706,7 @@ uchar ctype_cp1251_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_cp1251_bin[] = { +static const uchar to_lower_cp1251_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3725,7 +3725,7 @@ uchar to_lower_cp1251_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1251_bin[] = { +static const uchar to_upper_cp1251_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3744,7 +3744,7 @@ uchar to_upper_cp1251_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uint16 to_uni_cp1251_bin[] = { +static const uint16 to_uni_cp1251_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3782,7 +3782,7 @@ uint16 to_uni_cp1251_bin[] = { #endif #ifdef HAVE_CHARSET_cp1251 -uchar ctype_cp1251_general_ci[] = { +static const uchar ctype_cp1251_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3802,7 +3802,7 @@ uchar ctype_cp1251_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_cp1251_general_ci[] = { +static const uchar to_lower_cp1251_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3821,7 +3821,7 @@ uchar to_lower_cp1251_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1251_general_ci[] = { +static const uchar to_upper_cp1251_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3840,7 +3840,7 @@ uchar to_upper_cp1251_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar sort_order_cp1251_general_ci[] = { +static const uchar sort_order_cp1251_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3859,7 +3859,7 @@ uchar sort_order_cp1251_general_ci[] = { 0xAD,0xAF,0xB1,0xB5,0xB9,0xBB,0xBD,0xBF,0xC3,0xC5,0xC7,0xC9,0xCB,0xCD,0xCF,0xD1 }; -uint16 to_uni_cp1251_general_ci[] = { +static const uint16 to_uni_cp1251_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -3897,7 +3897,7 @@ uint16 to_uni_cp1251_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp1251 -uchar ctype_cp1251_general_cs[] = { +static const uchar ctype_cp1251_general_cs[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -3917,7 +3917,7 @@ uchar ctype_cp1251_general_cs[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_cp1251_general_cs[] = { +static const uchar to_lower_cp1251_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3936,7 +3936,7 @@ uchar to_lower_cp1251_general_cs[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1251_general_cs[] = { +static const uchar to_upper_cp1251_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3955,7 +3955,7 @@ uchar to_upper_cp1251_general_cs[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar sort_order_cp1251_general_cs[] = { +static const uchar sort_order_cp1251_general_cs[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -3974,7 +3974,7 @@ uchar sort_order_cp1251_general_cs[] = { 0xAE,0xB0,0xB2,0xB6,0xBA,0xBC,0xBE,0xC0,0xC4,0xC6,0xC8,0xCA,0xCC,0xCE,0xD0,0xD2 }; -uint16 to_uni_cp1251_general_cs[] = { +static const uint16 to_uni_cp1251_general_cs[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4012,7 +4012,7 @@ uint16 to_uni_cp1251_general_cs[] = { #endif #ifdef HAVE_CHARSET_macroman -uchar ctype_macroman_bin[] = { +static const uchar ctype_macroman_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4032,7 +4032,7 @@ uchar ctype_macroman_bin[] = { 0x00,0x01,0x01,0x01,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_macroman_bin[] = { +static const uchar to_lower_macroman_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4051,7 +4051,7 @@ uchar to_lower_macroman_bin[] = { 0xF0,0x98,0x9C,0x9E,0x9D,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_macroman_bin[] = { +static const uchar to_upper_macroman_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4070,7 +4070,7 @@ uchar to_upper_macroman_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_macroman_bin[] = { +static const uint16 to_uni_macroman_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4108,7 +4108,7 @@ uint16 to_uni_macroman_bin[] = { #endif #ifdef HAVE_CHARSET_cp1256 -uchar ctype_cp1256_general_ci[] = { +static const uchar ctype_cp1256_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4128,7 +4128,7 @@ uchar ctype_cp1256_general_ci[] = { 0x03,0x03,0x03,0x03,0x02,0x03,0x03,0x00,0x03,0x02,0x03,0x02,0x02,0x00,0x00,0x00 }; -uchar to_lower_cp1256_general_ci[] = { +static const uchar to_lower_cp1256_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4147,7 +4147,7 @@ uchar to_lower_cp1256_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1256_general_ci[] = { +static const uchar to_upper_cp1256_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4166,7 +4166,7 @@ uchar to_upper_cp1256_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_cp1256_general_ci[] = { +static const uchar sort_order_cp1256_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4185,7 +4185,7 @@ uchar sort_order_cp1256_general_ci[] = { 0xAE,0xAF,0xB0,0xB1,0x69,0xB2,0xB3,0xFC,0xB4,0x78,0xB5,0x79,0x7A,0xFD,0xFE,0xFF }; -uint16 to_uni_cp1256_general_ci[] = { +static const uint16 to_uni_cp1256_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4223,7 +4223,7 @@ uint16 to_uni_cp1256_general_ci[] = { #endif #ifdef HAVE_CHARSET_cp1257 -uchar ctype_cp1257_bin[] = { +static const uchar ctype_cp1257_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4243,7 +4243,7 @@ uchar ctype_cp1257_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 }; -uchar to_lower_cp1257_bin[] = { +static const uchar to_lower_cp1257_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4262,7 +4262,7 @@ uchar to_lower_cp1257_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1257_bin[] = { +static const uchar to_upper_cp1257_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4281,7 +4281,7 @@ uchar to_upper_cp1257_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uint16 to_uni_cp1257_bin[] = { +static const uint16 to_uni_cp1257_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4319,7 +4319,7 @@ uint16 to_uni_cp1257_bin[] = { #endif #ifdef HAVE_CHARSET_cp1257 -uchar ctype_cp1257_general_ci[] = { +static const uchar ctype_cp1257_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4339,7 +4339,7 @@ uchar ctype_cp1257_general_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 }; -uchar to_lower_cp1257_general_ci[] = { +static const uchar to_lower_cp1257_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4358,7 +4358,7 @@ uchar to_lower_cp1257_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1257_general_ci[] = { +static const uchar to_upper_cp1257_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4377,7 +4377,7 @@ uchar to_upper_cp1257_general_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_cp1257_general_ci[] = { +static const uchar sort_order_cp1257_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4396,7 +4396,7 @@ uchar sort_order_cp1257_general_ci[] = { 0x97,0x7D,0x7D,0x83,0x83,0x83,0x83,0xC3,0xA0,0x75,0x97,0xA0,0xA0,0xB0,0xB0,0xFF }; -uint16 to_uni_cp1257_general_ci[] = { +static const uint16 to_uni_cp1257_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4434,7 +4434,7 @@ uint16 to_uni_cp1257_general_ci[] = { #endif #ifdef HAVE_CHARSET_armscii8 -uchar ctype_armscii8_bin[] = { +static const uchar ctype_armscii8_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4454,7 +4454,7 @@ uchar ctype_armscii8_bin[] = { 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x10,0x10 }; -uchar to_lower_armscii8_bin[] = { +static const uchar to_lower_armscii8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4473,7 +4473,7 @@ uchar to_lower_armscii8_bin[] = { 0xF1,0xF1,0xF3,0xF3,0xF5,0xF5,0xF7,0xF7,0xF9,0xF9,0xFB,0xFB,0xFD,0xFD,0xFE,0xFF }; -uchar to_upper_armscii8_bin[] = { +static const uchar to_upper_armscii8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4492,7 +4492,7 @@ uchar to_upper_armscii8_bin[] = { 0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFE,0xFF }; -uint16 to_uni_armscii8_bin[] = { +static const uint16 to_uni_armscii8_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4530,7 +4530,7 @@ uint16 to_uni_armscii8_bin[] = { #endif #ifdef HAVE_CHARSET_ascii -uchar ctype_ascii_bin[] = { +static const uchar ctype_ascii_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4550,7 +4550,7 @@ uchar ctype_ascii_bin[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_ascii_bin[] = { +static const uchar to_lower_ascii_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4569,7 +4569,7 @@ uchar to_lower_ascii_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_ascii_bin[] = { +static const uchar to_upper_ascii_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4588,7 +4588,7 @@ uchar to_upper_ascii_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_ascii_bin[] = { +static const uint16 to_uni_ascii_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4626,7 +4626,7 @@ uint16 to_uni_ascii_bin[] = { #endif #ifdef HAVE_CHARSET_cp1250 -uchar ctype_cp1250_bin[] = { +static const uchar ctype_cp1250_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4646,7 +4646,7 @@ uchar ctype_cp1250_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_cp1250_bin[] = { +static const uchar to_lower_cp1250_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4665,7 +4665,7 @@ uchar to_lower_cp1250_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1250_bin[] = { +static const uchar to_upper_cp1250_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4684,7 +4684,7 @@ uchar to_upper_cp1250_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uint16 to_uni_cp1250_bin[] = { +static const uint16 to_uni_cp1250_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4722,7 +4722,7 @@ uint16 to_uni_cp1250_bin[] = { #endif #ifdef HAVE_CHARSET_cp1256 -uchar ctype_cp1256_bin[] = { +static const uchar ctype_cp1256_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4742,7 +4742,7 @@ uchar ctype_cp1256_bin[] = { 0x03,0x03,0x03,0x03,0x02,0x03,0x03,0x00,0x03,0x02,0x03,0x02,0x02,0x00,0x00,0x00 }; -uchar to_lower_cp1256_bin[] = { +static const uchar to_lower_cp1256_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4761,7 +4761,7 @@ uchar to_lower_cp1256_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1256_bin[] = { +static const uchar to_upper_cp1256_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4780,7 +4780,7 @@ uchar to_upper_cp1256_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_cp1256_bin[] = { +static const uint16 to_uni_cp1256_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4818,7 +4818,7 @@ uint16 to_uni_cp1256_bin[] = { #endif #ifdef HAVE_CHARSET_cp866 -uchar ctype_cp866_bin[] = { +static const uchar ctype_cp866_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4838,7 +4838,7 @@ uchar ctype_cp866_bin[] = { 0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48 }; -uchar to_lower_cp866_bin[] = { +static const uchar to_lower_cp866_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4857,7 +4857,7 @@ uchar to_lower_cp866_bin[] = { 0xF1,0xF1,0xF3,0xF3,0xF5,0xF5,0xF7,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp866_bin[] = { +static const uchar to_upper_cp866_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4876,7 +4876,7 @@ uchar to_upper_cp866_bin[] = { 0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_cp866_bin[] = { +static const uint16 to_uni_cp866_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -4914,7 +4914,7 @@ uint16 to_uni_cp866_bin[] = { #endif #ifdef HAVE_CHARSET_dec8 -uchar ctype_dec8_bin[] = { +static const uchar ctype_dec8_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -4934,7 +4934,7 @@ uchar ctype_dec8_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_dec8_bin[] = { +static const uchar to_lower_dec8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4953,7 +4953,7 @@ uchar to_lower_dec8_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_dec8_bin[] = { +static const uchar to_upper_dec8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -4972,7 +4972,7 @@ uchar to_upper_dec8_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uint16 to_uni_dec8_bin[] = { +static const uint16 to_uni_dec8_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5010,7 +5010,7 @@ uint16 to_uni_dec8_bin[] = { #endif #ifdef HAVE_CHARSET_greek -uchar ctype_greek_bin[] = { +static const uchar ctype_greek_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5030,7 +5030,7 @@ uchar ctype_greek_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00 }; -uchar to_lower_greek_bin[] = { +static const uchar to_lower_greek_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5049,7 +5049,7 @@ uchar to_lower_greek_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_greek_bin[] = { +static const uchar to_upper_greek_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5068,7 +5068,7 @@ uchar to_upper_greek_bin[] = { 0xD0,0xD1,0xD3,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xCF,0xD5,0xD9,0xFF }; -uint16 to_uni_greek_bin[] = { +static const uint16 to_uni_greek_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5106,7 +5106,7 @@ uint16 to_uni_greek_bin[] = { #endif #ifdef HAVE_CHARSET_hebrew -uchar ctype_hebrew_bin[] = { +static const uchar ctype_hebrew_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5126,7 +5126,7 @@ uchar ctype_hebrew_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x20,0x20,0x00 }; -uchar to_lower_hebrew_bin[] = { +static const uchar to_lower_hebrew_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5145,7 +5145,7 @@ uchar to_lower_hebrew_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_hebrew_bin[] = { +static const uchar to_upper_hebrew_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5164,7 +5164,7 @@ uchar to_upper_hebrew_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_hebrew_bin[] = { +static const uint16 to_uni_hebrew_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5202,7 +5202,7 @@ uint16 to_uni_hebrew_bin[] = { #endif #ifdef HAVE_CHARSET_hp8 -uchar ctype_hp8_bin[] = { +static const uchar ctype_hp8_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5222,7 +5222,7 @@ uchar ctype_hp8_bin[] = { 0x10,0x10,0x20,0x20,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 }; -uchar to_lower_hp8_bin[] = { +static const uchar to_lower_hp8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5241,7 +5241,7 @@ uchar to_lower_hp8_bin[] = { 0xF1,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_hp8_bin[] = { +static const uchar to_upper_hp8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5260,7 +5260,7 @@ uchar to_upper_hp8_bin[] = { 0xF0,0xF0,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_hp8_bin[] = { +static const uint16 to_uni_hp8_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5298,7 +5298,7 @@ uint16 to_uni_hp8_bin[] = { #endif #ifdef HAVE_CHARSET_keybcs2 -uchar ctype_keybcs2_bin[] = { +static const uchar ctype_keybcs2_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5318,7 +5318,7 @@ uchar ctype_keybcs2_bin[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48 }; -uchar to_lower_keybcs2_bin[] = { +static const uchar to_lower_keybcs2_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5337,7 +5337,7 @@ uchar to_lower_keybcs2_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_keybcs2_bin[] = { +static const uchar to_upper_keybcs2_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5356,7 +5356,7 @@ uchar to_upper_keybcs2_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_keybcs2_bin[] = { +static const uint16 to_uni_keybcs2_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5394,7 +5394,7 @@ uint16 to_uni_keybcs2_bin[] = { #endif #ifdef HAVE_CHARSET_koi8r -uchar ctype_koi8r_bin[] = { +static const uchar ctype_koi8r_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5414,7 +5414,7 @@ uchar ctype_koi8r_bin[] = { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 }; -uchar to_lower_koi8r_bin[] = { +static const uchar to_lower_koi8r_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5433,7 +5433,7 @@ uchar to_lower_koi8r_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar to_upper_koi8r_bin[] = { +static const uchar to_upper_koi8r_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5452,7 +5452,7 @@ uchar to_upper_koi8r_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_koi8r_bin[] = { +static const uint16 to_uni_koi8r_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5490,7 +5490,7 @@ uint16 to_uni_koi8r_bin[] = { #endif #ifdef HAVE_CHARSET_koi8u -uchar ctype_koi8u_bin[] = { +static const uchar ctype_koi8u_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5510,7 +5510,7 @@ uchar ctype_koi8u_bin[] = { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 }; -uchar to_lower_koi8u_bin[] = { +static const uchar to_lower_koi8u_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5529,7 +5529,7 @@ uchar to_lower_koi8u_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF }; -uchar to_upper_koi8u_bin[] = { +static const uchar to_upper_koi8u_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5548,7 +5548,7 @@ uchar to_upper_koi8u_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_koi8u_bin[] = { +static const uint16 to_uni_koi8u_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5586,7 +5586,7 @@ uint16 to_uni_koi8u_bin[] = { #endif #ifdef HAVE_CHARSET_latin2 -uchar ctype_latin2_bin[] = { +static const uchar ctype_latin2_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5606,7 +5606,7 @@ uchar ctype_latin2_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin2_bin[] = { +static const uchar to_lower_latin2_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5625,7 +5625,7 @@ uchar to_lower_latin2_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin2_bin[] = { +static const uchar to_upper_latin2_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5644,7 +5644,7 @@ uchar to_upper_latin2_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uint16 to_uni_latin2_bin[] = { +static const uint16 to_uni_latin2_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5682,7 +5682,7 @@ uint16 to_uni_latin2_bin[] = { #endif #ifdef HAVE_CHARSET_latin5 -uchar ctype_latin5_bin[] = { +static const uchar ctype_latin5_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5702,7 +5702,7 @@ uchar ctype_latin5_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin5_bin[] = { +static const uchar to_lower_latin5_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5721,7 +5721,7 @@ uchar to_lower_latin5_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin5_bin[] = { +static const uchar to_upper_latin5_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5740,7 +5740,7 @@ uchar to_upper_latin5_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0x49,0xDE,0xFF }; -uint16 to_uni_latin5_bin[] = { +static const uint16 to_uni_latin5_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5778,7 +5778,7 @@ uint16 to_uni_latin5_bin[] = { #endif #ifdef HAVE_CHARSET_latin7 -uchar ctype_latin7_bin[] = { +static const uchar ctype_latin7_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5798,7 +5798,7 @@ uchar ctype_latin7_bin[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_latin7_bin[] = { +static const uchar to_lower_latin7_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5817,7 +5817,7 @@ uchar to_lower_latin7_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin7_bin[] = { +static const uchar to_upper_latin7_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5836,7 +5836,7 @@ uchar to_upper_latin7_bin[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uint16 to_uni_latin7_bin[] = { +static const uint16 to_uni_latin7_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5874,7 +5874,7 @@ uint16 to_uni_latin7_bin[] = { #endif #ifdef HAVE_CHARSET_cp850 -uchar ctype_cp850_bin[] = { +static const uchar ctype_cp850_bin[] = { 0x00, 0x20,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x30,0x30, 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x20,0x30,0x30,0x30,0x30,0x30, @@ -5894,7 +5894,7 @@ uchar ctype_cp850_bin[] = { 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x20 }; -uchar to_lower_cp850_bin[] = { +static const uchar to_lower_cp850_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5913,7 +5913,7 @@ uchar to_lower_cp850_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp850_bin[] = { +static const uchar to_upper_cp850_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -5932,7 +5932,7 @@ uchar to_upper_cp850_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_cp850_bin[] = { +static const uint16 to_uni_cp850_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -5970,7 +5970,7 @@ uint16 to_uni_cp850_bin[] = { #endif #ifdef HAVE_CHARSET_cp852 -uchar ctype_cp852_bin[] = { +static const uchar ctype_cp852_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -5990,7 +5990,7 @@ uchar ctype_cp852_bin[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x02,0x00,0x48 }; -uchar to_lower_cp852_bin[] = { +static const uchar to_lower_cp852_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6009,7 +6009,7 @@ uchar to_lower_cp852_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp852_bin[] = { +static const uchar to_upper_cp852_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6028,7 +6028,7 @@ uchar to_upper_cp852_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF }; -uint16 to_uni_cp852_bin[] = { +static const uint16 to_uni_cp852_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -6066,7 +6066,7 @@ uint16 to_uni_cp852_bin[] = { #endif #ifdef HAVE_CHARSET_swe7 -uchar ctype_swe7_bin[] = { +static const uchar ctype_swe7_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -6086,7 +6086,7 @@ uchar ctype_swe7_bin[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_swe7_bin[] = { +static const uchar to_lower_swe7_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6105,7 +6105,7 @@ uchar to_lower_swe7_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_swe7_bin[] = { +static const uchar to_upper_swe7_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6124,7 +6124,7 @@ uchar to_upper_swe7_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_swe7_bin[] = { +static const uint16 to_uni_swe7_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -6162,7 +6162,7 @@ uint16 to_uni_swe7_bin[] = { #endif #ifdef HAVE_CHARSET_geostd8 -uchar ctype_geostd8_general_ci[] = { +static const uchar ctype_geostd8_general_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -6182,7 +6182,7 @@ uchar ctype_geostd8_general_ci[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_geostd8_general_ci[] = { +static const uchar to_lower_geostd8_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6201,7 +6201,7 @@ uchar to_lower_geostd8_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_geostd8_general_ci[] = { +static const uchar to_upper_geostd8_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6220,7 +6220,7 @@ uchar to_upper_geostd8_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar sort_order_geostd8_general_ci[] = { +static const uchar sort_order_geostd8_general_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6239,7 +6239,7 @@ uchar sort_order_geostd8_general_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_geostd8_general_ci[] = { +static const uint16 to_uni_geostd8_general_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -6277,7 +6277,7 @@ uint16 to_uni_geostd8_general_ci[] = { #endif #ifdef HAVE_CHARSET_geostd8 -uchar ctype_geostd8_bin[] = { +static const uchar ctype_geostd8_bin[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -6297,7 +6297,7 @@ uchar ctype_geostd8_bin[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar to_lower_geostd8_bin[] = { +static const uchar to_lower_geostd8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6316,7 +6316,7 @@ uchar to_lower_geostd8_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_geostd8_bin[] = { +static const uchar to_upper_geostd8_bin[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6335,7 +6335,7 @@ uchar to_upper_geostd8_bin[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uint16 to_uni_geostd8_bin[] = { +static const uint16 to_uni_geostd8_bin[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -6373,7 +6373,7 @@ uint16 to_uni_geostd8_bin[] = { #endif #ifdef HAVE_CHARSET_latin1 -uchar ctype_latin1_spanish_ci[] = { +static const uchar ctype_latin1_spanish_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -6393,7 +6393,7 @@ uchar ctype_latin1_spanish_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02 }; -uchar to_lower_latin1_spanish_ci[] = { +static const uchar to_lower_latin1_spanish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6412,7 +6412,7 @@ uchar to_lower_latin1_spanish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_latin1_spanish_ci[] = { +static const uchar to_upper_latin1_spanish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6431,7 +6431,7 @@ uchar to_upper_latin1_spanish_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_latin1_spanish_ci[] = { +static const uchar sort_order_latin1_spanish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6450,7 +6450,7 @@ uchar sort_order_latin1_spanish_ci[] = { 0x57,0x7F,0x81,0x81,0x81,0x81,0x81,0xBE,0x81,0x9A,0x9A,0x9A,0x9A,0xAA,0xB1,0xAA }; -uint16 to_uni_latin1_spanish_ci[] = { +static const uint16 to_uni_latin1_spanish_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -6488,7 +6488,7 @@ uint16 to_uni_latin1_spanish_ci[] = { #endif #ifdef HAVE_CHARSET_cp1250 -uchar ctype_cp1250_polish_ci[] = { +static const uchar ctype_cp1250_polish_ci[] = { 0x00, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x28,0x28,0x28,0x28,0x28,0x20,0x20, 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, @@ -6508,7 +6508,7 @@ uchar ctype_cp1250_polish_ci[] = { 0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x10 }; -uchar to_lower_cp1250_polish_ci[] = { +static const uchar to_lower_cp1250_polish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6527,7 +6527,7 @@ uchar to_lower_cp1250_polish_ci[] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar to_upper_cp1250_polish_ci[] = { +static const uchar to_upper_cp1250_polish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6546,7 +6546,7 @@ uchar to_upper_cp1250_polish_ci[] = { 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF }; -uchar sort_order_cp1250_polish_ci[] = { +static const uchar sort_order_cp1250_polish_ci[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -6565,7 +6565,7 @@ uchar sort_order_cp1250_polish_ci[] = { 0x48,0x58,0x57,0x5A,0x59,0x59,0x59,0xC9,0x5D,0x64,0x64,0x64,0x64,0x69,0x62,0xFF }; -uint16 to_uni_cp1250_polish_ci[] = { +static const uint16 to_uni_cp1250_polish_ci[] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -6602,7 +6602,7 @@ uint16 to_uni_cp1250_polish_ci[] = { #endif -CHARSET_INFO compiled_charsets[] = { +struct charset_info_st compiled_charsets[] = { #ifdef HAVE_CHARSET_dec8 { 3,0,0, diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index 0267f35ff5c..641fe2ea24e 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -29,7 +29,7 @@ #ifdef HAVE_CHARSET_gb2312 -static uchar NEAR ctype_gb2312[257] = +static const uchar NEAR ctype_gb2312[257] = { 0, /* For standard library */ 32,32,32,32,32,32,32,32,32,40,40,40,40,40,32,32, @@ -50,7 +50,7 @@ static uchar NEAR ctype_gb2312[257] = 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0, }; -static uchar NEAR to_lower_gb2312[]= +static const uchar NEAR to_lower_gb2312[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -86,7 +86,7 @@ static uchar NEAR to_lower_gb2312[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR to_upper_gb2312[]= +static const uchar NEAR to_upper_gb2312[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -122,7 +122,7 @@ static uchar NEAR to_upper_gb2312[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR sort_order_gb2312[]= +static const uchar NEAR sort_order_gb2312[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -178,7 +178,7 @@ static uint mbcharlen_gb2312(CHARSET_INFO *cs __attribute__((unused)),uint c) /* page 0 0x2121-0x2658 */ -static uint16 tab_gb2312_uni0[]={ +static const uint16 tab_gb2312_uni0[]={ 0x3000,0x3001,0x3002,0x30FB,0x02C9,0x02C7,0x00A8,0x3003, 0x3005,0x2015,0xFF5E,0x2016,0x2026,0x2018,0x2019,0x201C, 0x201D,0x3014,0x3015,0x3008,0x3009,0x300A,0x300B,0x300C, @@ -349,7 +349,7 @@ static uint16 tab_gb2312_uni0[]={ }; /* page 1 0x2721-0x296F */ -static uint16 tab_gb2312_uni1[]={ +static const uint16 tab_gb2312_uni1[]={ 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416, 0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E, 0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426, @@ -426,7 +426,7 @@ static uint16 tab_gb2312_uni1[]={ 0x2545,0x2546,0x2547,0x2548,0x2549,0x254A,0x254B}; /* page 2 0x3021-0x777E */ -static uint16 tab_gb2312_uni2[]={ +static const uint16 tab_gb2312_uni2[]={ 0x554A,0x963F,0x57C3,0x6328,0x54CE,0x5509,0x54C0,0x7691, 0x764C,0x853C,0x77EE,0x827E,0x788D,0x7231,0x9698,0x978D, 0x6C28,0x5B89,0x4FFA,0x6309,0x6697,0x5CB8,0x80FA,0x6848, @@ -2724,7 +2724,7 @@ static int func_gb2312_uni_onechar(int code){ /* page 0 0x00A4-0x01DC */ -static uint16 tab_uni_gb23120[]={ +static const uint16 tab_uni_gb23120[]={ 0x2168, 0, 0,0x216C,0x2127, 0, 0, 0, 0, 0, 0, 0,0x2163,0x2140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2767,7 +2767,7 @@ static uint16 tab_uni_gb23120[]={ 0x2838}; /* page 1 0x02C7-0x0451 */ -static uint16 tab_uni_gb23121[]={ +static const uint16 tab_uni_gb23121[]={ 0x2126, 0,0x2125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2820,7 +2820,7 @@ static uint16 tab_uni_gb23121[]={ 0x2771, 0,0x2757}; /* page 2 0x2015-0x2312 */ -static uint16 tab_uni_gb23122[]={ +static const uint16 tab_uni_gb23122[]={ 0x212A,0x212C, 0,0x212E,0x212F, 0, 0,0x2130, 0x2131, 0, 0, 0, 0, 0, 0, 0, 0,0x212D, 0, 0, 0, 0, 0, 0, @@ -2919,7 +2919,7 @@ static uint16 tab_uni_gb23122[]={ 0, 0, 0, 0, 0,0x2150}; /* page 3 0x2460-0x2642 */ -static uint16 tab_uni_gb23123[]={ +static const uint16 tab_uni_gb23123[]={ 0x2259,0x225A,0x225B,0x225C,0x225D,0x225E,0x225F,0x2260, 0x2261,0x2262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2245,0x2246,0x2247,0x2248, @@ -2983,7 +2983,7 @@ static uint16 tab_uni_gb23123[]={ 0x2162, 0,0x2161}; /* page 4 0x3000-0x3129 */ -static uint16 tab_uni_gb23124[]={ +static const uint16 tab_uni_gb23124[]={ 0x2121,0x2122,0x2123,0x2128, 0,0x2129, 0, 0, 0x2134,0x2135,0x2136,0x2137,0x2138,0x2139,0x213A,0x213B, 0x213E,0x213F, 0,0x217E,0x2132,0x2133,0x213C,0x213D, @@ -3024,12 +3024,12 @@ static uint16 tab_uni_gb23124[]={ 0x2868,0x2869}; /* page 5 0x3220-0x3229 */ -static uint16 tab_uni_gb23125[]={ +static const uint16 tab_uni_gb23125[]={ 0x2265,0x2266,0x2267,0x2268,0x2269,0x226A,0x226B,0x226C, 0x226D,0x226E}; /* page 6 0x4E00-0x9B54 */ -static uint16 tab_uni_gb23126[]={ +static const uint16 tab_uni_gb23126[]={ 0x523B,0x3621, 0,0x465F, 0, 0, 0,0x4D72, 0x5549,0x487D,0x494F,0x4F42,0x5822,0x323B,0x536B, 0, 0x5824,0x3373, 0,0x5728,0x4752,0x5827,0x4A40, 0, @@ -5507,7 +5507,7 @@ static uint16 tab_uni_gb23126[]={ 0,0x774E, 0, 0,0x4427}; /* page 7 0x9C7C-0x9CE2 */ -static uint16 tab_uni_gb23127[]={ +static const uint16 tab_uni_gb23127[]={ 0x5363, 0, 0,0x764F, 0,0x4233,0x7650, 0, 0,0x7651,0x7652,0x7653,0x7654, 0, 0,0x7656, 0,0x312B,0x7657, 0,0x7658,0x7659,0x765A, 0, @@ -5523,7 +5523,7 @@ static uint16 tab_uni_gb23127[]={ 0x772C,0x772D,0x415B,0x772E, 0, 0,0x772F}; /* page 8 0x9E1F-0x9FA0 */ -static uint16 tab_uni_gb23128[]={ +static const uint16 tab_uni_gb23128[]={ 0x4471,0x702F,0x3C26,0x7030,0x4379, 0,0x4538,0x513B, 0,0x7031,0x7032,0x7033,0x7034,0x7035,0x513C, 0, 0x516C, 0,0x7037,0x7036,0x5427, 0,0x4D52,0x7038, @@ -5575,7 +5575,7 @@ static uint16 tab_uni_gb23128[]={ 0x396A,0x595F}; /* page 9 0xFF01-0xFFE5 */ -static uint16 tab_uni_gb23129[]={ +static const uint16 tab_uni_gb23129[]={ 0x2321,0x2322,0x2323,0x2167,0x2325,0x2326,0x2327,0x2328, 0x2329,0x232A,0x232B,0x232C,0x232D,0x232E,0x232F,0x2330, 0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338, @@ -5765,7 +5765,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_gb2312_chinese_ci= +struct charset_info_st my_charset_gb2312_chinese_ci= { 24,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ @@ -5797,7 +5797,7 @@ CHARSET_INFO my_charset_gb2312_chinese_ci= &my_collation_ci_handler }; -CHARSET_INFO my_charset_gb2312_bin= +struct charset_info_st my_charset_gb2312_bin= { 86,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index 7b8bb85652b..46b711d92be 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -25,7 +25,6 @@ * .configure. mbmaxlen_gbk=2 */ - #include <my_global.h> #include "m_string.h" #include "m_ctype.h" @@ -44,7 +43,7 @@ #define gbkhead(e) ((uchar)(e>>8)) #define gbktail(e) ((uchar)(e&0xff)) -static uchar NEAR ctype_gbk[257] = +static const uchar NEAR ctype_gbk[257] = { 0, /* For standard library */ 32,32,32,32,32,32,32,32,32,40,40,40,40,40,32,32, @@ -65,7 +64,7 @@ static uchar NEAR ctype_gbk[257] = 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0, }; -static uchar NEAR to_lower_gbk[]= +static const uchar NEAR to_lower_gbk[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -101,7 +100,7 @@ static uchar NEAR to_lower_gbk[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR to_upper_gbk[]= +static const uchar NEAR to_upper_gbk[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -137,7 +136,7 @@ static uchar NEAR to_upper_gbk[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR sort_order_gbk[]= +static const uchar NEAR sort_order_gbk[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -173,7 +172,7 @@ static uchar NEAR sort_order_gbk[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uint16 NEAR gbk_order[]= +static const uint16 NEAR gbk_order[]= { 8653,14277,17116,11482,11160,2751,14613,3913,13337,9827, 19496,1759,8105,7103,7836,5638,2223,21433,5878,8006, @@ -2782,7 +2781,7 @@ static uint mbcharlen_gbk(CHARSET_INFO *cs __attribute__((unused)),uint c) } /* page 0 0x8140-0xFE4F */ -static uint16 tab_gbk_uni0[]={ +static const uint16 tab_gbk_uni0[]={ 0x4E02,0x4E04,0x4E05,0x4E06,0x4E0F,0x4E12,0x4E17,0x4E1F, 0x4E20,0x4E21,0x4E23,0x4E26,0x4E29,0x4E2E,0x4E2F,0x4E31, 0x4E33,0x4E35,0x4E37,0x4E3C,0x4E40,0x4E41,0x4E42,0x4E44, @@ -6796,7 +6795,7 @@ static int func_gbk_uni_onechar(int code){ /* page 0 0x00A4-0x0451 */ -static uint16 tab_uni_gbk0[]={ +static const uint16 tab_uni_gbk0[]={ 0xA1E8, 0, 0,0xA1EC,0xA1A7, 0, 0, 0, 0, 0, 0, 0,0xA1E3,0xA1C0, 0, 0, 0, 0, 0,0xA1A4, 0, 0, 0, 0, @@ -6917,7 +6916,7 @@ static uint16 tab_uni_gbk0[]={ 0xA7EE,0xA7EF,0xA7F0,0xA7F1, 0,0xA7D7}; /* page 1 0x2010-0x2312 */ -static uint16 tab_uni_gbk1[]={ +static const uint16 tab_uni_gbk1[]={ 0xA95C, 0, 0,0xA843,0xA1AA,0xA844,0xA1AC, 0, 0xA1AE,0xA1AF, 0, 0,0xA1B0,0xA1B1, 0, 0, 0, 0, 0, 0, 0,0xA845,0xA1AD, 0, @@ -7017,7 +7016,7 @@ static uint16 tab_uni_gbk1[]={ 0, 0,0xA1D0}; /* page 2 0x2460-0x2642 */ -static uint16 tab_uni_gbk2[]={ +static const uint16 tab_uni_gbk2[]={ 0xA2D9,0xA2DA,0xA2DB,0xA2DC,0xA2DD,0xA2DE,0xA2DF,0xA2E0, 0xA2E1,0xA2E2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0xA2C5,0xA2C6,0xA2C7,0xA2C8, @@ -7081,7 +7080,7 @@ static uint16 tab_uni_gbk2[]={ 0xA1E2, 0,0xA1E1}; /* page 3 0x3000-0x3129 */ -static uint16 tab_uni_gbk3[]={ +static const uint16 tab_uni_gbk3[]={ 0xA1A1,0xA1A2,0xA1A3,0xA1A8, 0,0xA1A9,0xA965,0xA996, 0xA1B4,0xA1B5,0xA1B6,0xA1B7,0xA1B8,0xA1B9,0xA1BA,0xA1BB, 0xA1BE,0xA1BF,0xA893,0xA1FE,0xA1B2,0xA1B3,0xA1BC,0xA1BD, @@ -7122,7 +7121,7 @@ static uint16 tab_uni_gbk3[]={ 0xA8E8,0xA8E9}; /* page 4 0x3220-0x32A3 */ -static uint16 tab_uni_gbk4[]={ +static const uint16 tab_uni_gbk4[]={ 0xA2E5,0xA2E6,0xA2E7,0xA2E8,0xA2E9,0xA2EA,0xA2EB,0xA2EC, 0xA2ED,0xA2EE, 0, 0, 0, 0, 0, 0, 0,0xA95A, 0, 0, 0, 0, 0, 0, @@ -7142,7 +7141,7 @@ static uint16 tab_uni_gbk4[]={ 0, 0, 0,0xA949}; /* page 5 0x338E-0x33D5 */ -static uint16 tab_uni_gbk5[]={ +static const uint16 tab_uni_gbk5[]={ 0xA94A,0xA94B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0xA94C,0xA94D, 0xA94E, 0, 0,0xA94F, 0, 0, 0, 0, @@ -7155,7 +7154,7 @@ static uint16 tab_uni_gbk5[]={ }; /* page 6 0x4E00-0x9FA5 */ -static uint16 tab_uni_gbk6[]={ +static const uint16 tab_uni_gbk6[]={ 0xD2BB,0xB6A1,0x8140,0xC6DF,0x8141,0x8142,0x8143,0xCDF2, 0xD5C9,0xC8FD,0xC9CF,0xCFC2,0xD8A2,0xB2BB,0xD3EB,0x8144, 0xD8A4,0xB3F3,0x8145,0xD7A8,0xC7D2,0xD8A7,0xCAC0,0x8146, @@ -9771,7 +9770,7 @@ static uint16 tab_uni_gbk6[]={ 0xD9DF,0xFD97,0xFD98,0xFD99,0xFD9A,0xFD9B}; /* page 7 0xF92C-0xFA29 */ -static uint16 tab_uni_gbk7[]={ +static const uint16 tab_uni_gbk7[]={ 0xFD9C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -9806,7 +9805,7 @@ static uint16 tab_uni_gbk7[]={ 0xFE4C, 0, 0,0xFE4D,0xFE4E,0xFE4F}; /* page 8 0xFE30-0xFFE5 */ -static uint16 tab_uni_gbk8[]={ +static const uint16 tab_uni_gbk8[]={ 0xA955,0xA6F2, 0,0xA6F4,0xA6F5,0xA6E0,0xA6E1,0xA6F0, 0xA6F1,0xA6E2,0xA6E3,0xA6EE,0xA6EF,0xA6E6,0xA6E7,0xA6E4, 0xA6E5,0xA6E8,0xA6E9,0xA6EA,0xA6EB, 0, 0, 0, @@ -10023,7 +10022,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_gbk_chinese_ci= +struct charset_info_st my_charset_gbk_chinese_ci= { 28,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ @@ -10055,7 +10054,7 @@ CHARSET_INFO my_charset_gbk_chinese_ci= &my_collation_ci_handler }; -CHARSET_INFO my_charset_gbk_bin= +struct charset_info_st my_charset_gbk_bin= { 87,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c index e5333c4101b..ebd019754c9 100644 --- a/strings/ctype-latin1.c +++ b/strings/ctype-latin1.c @@ -17,7 +17,7 @@ #include "m_string.h" #include "m_ctype.h" -static uchar ctype_latin1[] = { +static const uchar ctype_latin1[] = { 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, @@ -37,7 +37,7 @@ static uchar ctype_latin1[] = { 2, 2, 2, 2, 2, 2, 2, 16, 2, 2, 2, 2, 2, 2, 2, 2 }; -static uchar to_lower_latin1[] = { +static const uchar to_lower_latin1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -56,7 +56,7 @@ static uchar to_lower_latin1[] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static uchar to_upper_latin1[] = { +static const uchar to_upper_latin1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -75,7 +75,7 @@ static uchar to_upper_latin1[] = { 208,209,210,211,212,213,214,247,216,217,218,219,220,221,222,255 }; -static uchar sort_order_latin1[] = { +static const uchar sort_order_latin1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -116,7 +116,7 @@ static uchar sort_order_latin1[] = { output doesn't reproduce these undefined characters. */ -unsigned short cs_to_uni[256]={ +static unsigned const short cs_to_uni[256]={ 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -150,7 +150,7 @@ unsigned short cs_to_uni[256]={ 0x00F0,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x00F7, 0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x00FD,0x00FE,0x00FF }; -uchar pl00[256]={ +static const uchar pl00[256]={ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, @@ -184,7 +184,7 @@ uchar pl00[256]={ 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7, 0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF }; -uchar pl01[256]={ +static const uchar pl01[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -218,7 +218,7 @@ uchar pl01[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar pl02[256]={ +static const uchar pl02[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -252,7 +252,7 @@ uchar pl02[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar pl20[256]={ +static const uchar pl20[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x96,0x97,0x00,0x00,0x00, @@ -286,7 +286,7 @@ uchar pl20[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar pl21[256]={ +static const uchar pl21[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -320,7 +320,7 @@ uchar pl21[256]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -uchar *uni_to_cs[256]={ +static const uchar *const uni_to_cs[256]={ pl00,pl01,pl02,NULL,NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, @@ -374,7 +374,7 @@ int my_wc_mb_latin1(CHARSET_INFO *cs __attribute__((unused)), uchar *str, uchar *end __attribute__((unused))) { - uchar *pl; + const uchar *pl; if (str >= end) return MY_CS_TOOSMALL; @@ -416,7 +416,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_latin1= +struct charset_info_st my_charset_latin1= { 8,0,0, /* number */ MY_CS_COMPILED | MY_CS_PRIMARY, /* state */ @@ -471,7 +471,7 @@ CHARSET_INFO my_charset_latin1= * Ü, ü, Ö, ö, Ä, ä */ -static uchar sort_order_latin1_de[] = { +static const uchar sort_order_latin1_de[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -495,7 +495,7 @@ static uchar sort_order_latin1_de[] = { same as sort_order_latin_de, but maps ALL accented chars to unaccented ones */ -uchar combo1map[]={ +static const uchar combo1map[]={ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -514,7 +514,7 @@ uchar combo1map[]={ 68, 78, 79, 79, 79, 79, 79,247,216, 85, 85, 85, 85, 89,222, 89 }; -uchar combo2map[]={ +static const uchar combo2map[]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -716,7 +716,7 @@ static MY_COLLATION_HANDLER my_collation_german2_ci_handler= }; -CHARSET_INFO my_charset_latin1_german2_ci= +struct charset_info_st my_charset_latin1_german2_ci= { 31,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM, /* state */ @@ -749,7 +749,7 @@ CHARSET_INFO my_charset_latin1_german2_ci= }; -CHARSET_INFO my_charset_latin1_bin= +struct charset_info_st my_charset_latin1_bin= { 47,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 51f93954bd5..6bb7977c294 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -23,7 +23,7 @@ size_t my_caseup_str_mb(CHARSET_INFO * cs, char *str) { register uint32 l; - register uchar *map= cs->to_upper; + register const uchar *map= cs->to_upper; char *str_orig= str; while (*str) @@ -44,7 +44,7 @@ size_t my_caseup_str_mb(CHARSET_INFO * cs, char *str) size_t my_casedn_str_mb(CHARSET_INFO * cs, char *str) { register uint32 l; - register uchar *map= cs->to_lower; + register const uchar *map= cs->to_lower; char *str_orig= str; while (*str) @@ -68,7 +68,7 @@ size_t my_caseup_mb(CHARSET_INFO * cs, char *src, size_t srclen, { register uint32 l; register char *srcend= src + srclen; - register uchar *map= cs->to_upper; + register const uchar *map= cs->to_upper; DBUG_ASSERT(src == dst && srclen == dstlen); while (src < srcend) @@ -91,7 +91,7 @@ size_t my_casedn_mb(CHARSET_INFO * cs, char *src, size_t srclen, { register uint32 l; register char *srcend= src + srclen; - register uchar *map=cs->to_lower; + register const uchar *map=cs->to_lower; DBUG_ASSERT(src == dst && srclen == dstlen); while (src < srcend) @@ -115,7 +115,7 @@ size_t my_casedn_mb(CHARSET_INFO * cs, char *src, size_t srclen, int my_strcasecmp_mb(CHARSET_INFO * cs,const char *s, const char *t) { register uint32 l; - register uchar *map=cs->to_upper; + register const uchar *map=cs->to_upper; while (*s && *t) { @@ -794,7 +794,7 @@ static int my_wildcmp_mb_bin(CHARSET_INFO *cs, Data was produced from EastAsianWidth.txt using utt11-dump utility. */ -static char pg11[256]= +static const char pg11[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -806,7 +806,7 @@ static char pg11[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pg23[256]= +static const char pg23[256]= { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -818,7 +818,7 @@ static char pg23[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pg2E[256]= +static const char pg2E[256]= { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -830,7 +830,7 @@ static char pg2E[256]= 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pg2F[256]= +static const char pg2F[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -842,7 +842,7 @@ static char pg2F[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0 }; -static char pg30[256]= +static const char pg30[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0, @@ -854,7 +854,7 @@ static char pg30[256]= 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 }; -static char pg31[256]= +static const char pg31[256]= { 0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -866,7 +866,7 @@ static char pg31[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 }; -static char pg32[256]= +static const char pg32[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -878,7 +878,7 @@ static char pg32[256]= 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0 }; -static char pg4D[256]= +static const char pg4D[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -890,7 +890,7 @@ static char pg4D[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pg9F[256]= +static const char pg9F[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -902,7 +902,7 @@ static char pg9F[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pgA4[256]= +static const char pgA4[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -914,7 +914,7 @@ static char pgA4[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pgD7[256]= +static const char pgD7[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -926,7 +926,7 @@ static char pgD7[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pgFA[256]= +static const char pgFA[256]= { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -938,7 +938,7 @@ static char pgFA[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pgFE[256]= +static const char pgFE[256]= { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -950,7 +950,7 @@ static char pgFE[256]= 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static char pgFF[256]= +static const char pgFF[256]= { 0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -962,7 +962,7 @@ static char pgFF[256]= 1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static struct {int page; char *p;} utr11_data[256]= +static const struct {int page; const char *p;} utr11_data[256]= { {0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL}, {0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL},{0,NULL}, diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 4f3aaa6f668..2c55137e3a0 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -75,7 +75,7 @@ size_t my_strnxfrm_simple(CHARSET_INFO * cs, uchar *dest, size_t len, const uchar *src, size_t srclen) { - uchar *map= cs->sort_order; + const uchar *map= cs->sort_order; size_t dstlen= len; set_if_smaller(len, srclen); if (dest != src) @@ -101,7 +101,7 @@ int my_strnncoll_simple(CHARSET_INFO * cs, const uchar *s, size_t slen, my_bool t_is_prefix) { size_t len = ( slen > tlen ) ? tlen : slen; - uchar *map= cs->sort_order; + const uchar *map= cs->sort_order; if (t_is_prefix && slen > tlen) slen=tlen; while (len--) @@ -195,7 +195,7 @@ int my_strnncollsp_simple(CHARSET_INFO * cs, const uchar *a, size_t a_length, size_t my_caseup_str_8bit(CHARSET_INFO * cs,char *str) { - register uchar *map= cs->to_upper; + register const uchar *map= cs->to_upper; char *str_orig= str; while ((*str= (char) map[(uchar) *str]) != 0) str++; @@ -205,7 +205,7 @@ size_t my_caseup_str_8bit(CHARSET_INFO * cs,char *str) size_t my_casedn_str_8bit(CHARSET_INFO * cs,char *str) { - register uchar *map= cs->to_lower; + register const uchar *map= cs->to_lower; char *str_orig= str; while ((*str= (char) map[(uchar) *str]) != 0) str++; @@ -218,7 +218,7 @@ size_t my_caseup_8bit(CHARSET_INFO * cs, char *src, size_t srclen, size_t dstlen __attribute__((unused))) { char *end= src + srclen; - register uchar *map= cs->to_upper; + register const uchar *map= cs->to_upper; DBUG_ASSERT(src == dst && srclen == dstlen); for ( ; src != end ; src++) *src= (char) map[(uchar) *src]; @@ -231,7 +231,7 @@ size_t my_casedn_8bit(CHARSET_INFO * cs, char *src, size_t srclen, size_t dstlen __attribute__((unused))) { char *end= src + srclen; - register uchar *map=cs->to_lower; + register const uchar *map=cs->to_lower; DBUG_ASSERT(src == dst && srclen == dstlen); for ( ; src != end ; src++) *src= (char) map[(uchar) *src]; @@ -240,7 +240,7 @@ size_t my_casedn_8bit(CHARSET_INFO * cs, char *src, size_t srclen, int my_strcasecmp_8bit(CHARSET_INFO * cs,const char *s, const char *t) { - register uchar *map=cs->to_upper; + register const uchar *map=cs->to_upper; while (map[(uchar) *s] == map[(uchar) *t++]) if (!*s++) return 0; return ((int) map[(uchar) s[0]] - (int) map[(uchar) t[-1]]); @@ -303,7 +303,7 @@ void my_hash_sort_simple(CHARSET_INFO *cs, const uchar *key, size_t len, ulong *nr1, ulong *nr2) { - register uchar *sort_order=cs->sort_order; + register const uchar *sort_order=cs->sort_order; const uchar *end= key + len; /* @@ -1235,7 +1235,7 @@ skip: typedef struct { int nchars; - MY_UNI_IDX uidx; + struct my_uni_idx_st uidx; } uni_idx; #define PLANE_SIZE 0x100 @@ -1253,10 +1253,12 @@ static int pcmp(const void * f, const void * s) return res; } -static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(size_t)) +static my_bool create_fromuni(struct charset_info_st *cs, + void *(*alloc)(size_t)) { uni_idx idx[PLANE_NUM]; int i,n; + struct my_uni_idx_st *tab_from_uni; /* Check that Unicode map is loaded. @@ -1297,16 +1299,18 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(size_t)) for (i=0; i < PLANE_NUM; i++) { int ch,numchars; + uchar *tab; /* Skip empty plane */ if (!idx[i].nchars) break; numchars=idx[i].uidx.to-idx[i].uidx.from+1; - if (!(idx[i].uidx.tab=(uchar*) alloc(numchars * sizeof(*idx[i].uidx.tab)))) + if (!(idx[i].uidx.tab= tab= (uchar*) + alloc(numchars * sizeof(*idx[i].uidx.tab)))) return TRUE; - bzero(idx[i].uidx.tab,numchars*sizeof(*idx[i].uidx.tab)); + bzero(tab,numchars*sizeof(*tab)); for (ch=1; ch < PLANE_SIZE; ch++) { @@ -1314,25 +1318,27 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(size_t)) if (wc >= idx[i].uidx.from && wc <= idx[i].uidx.to && wc) { int ofs= wc - idx[i].uidx.from; - idx[i].uidx.tab[ofs]= ch; + tab[ofs]= ch; } } } /* Allocate and fill reverse table for each plane */ n=i; - if (!(cs->tab_from_uni= (MY_UNI_IDX*) alloc(sizeof(MY_UNI_IDX)*(n+1)))) + if (!(cs->tab_from_uni= tab_from_uni= (struct my_uni_idx_st*) + alloc(sizeof(MY_UNI_IDX)*(n+1)))) return TRUE; for (i=0; i< n; i++) - cs->tab_from_uni[i]= idx[i].uidx; + tab_from_uni[i]= idx[i].uidx; /* Set end-of-list marker */ - bzero(&cs->tab_from_uni[i],sizeof(MY_UNI_IDX)); + bzero(&tab_from_uni[i],sizeof(MY_UNI_IDX)); return FALSE; } -static my_bool my_cset_init_8bit(CHARSET_INFO *cs, void *(*alloc)(size_t)) +static my_bool my_cset_init_8bit(struct charset_info_st *cs, + void *(*alloc)(size_t)) { cs->caseup_multiply= 1; cs->casedn_multiply= 1; @@ -1340,7 +1346,7 @@ static my_bool my_cset_init_8bit(CHARSET_INFO *cs, void *(*alloc)(size_t)) return create_fromuni(cs, alloc); } -static void set_max_sort_char(CHARSET_INFO *cs) +static void set_max_sort_char(struct charset_info_st *cs) { uchar max_char; uint i; @@ -1359,7 +1365,7 @@ static void set_max_sort_char(CHARSET_INFO *cs) } } -static my_bool my_coll_init_simple(CHARSET_INFO *cs, +static my_bool my_coll_init_simple(struct charset_info_st *cs, void *(*alloc)(size_t) __attribute__((unused))) { set_max_sort_char(cs); diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index cc7581ffe6e..81d1c57412d 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -31,7 +31,7 @@ * .configure. mbmaxlen_sjis=2 */ -static uchar NEAR ctype_sjis[257] = +static const uchar NEAR ctype_sjis[257] = { 0, /* For standard library */ 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ @@ -68,7 +68,7 @@ static uchar NEAR ctype_sjis[257] = 0020, 0020, 0020, 0020, 0020, 0000, 0000, 0000 }; -static uchar NEAR to_lower_sjis[]= +static const uchar NEAR to_lower_sjis[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -104,7 +104,7 @@ static uchar NEAR to_lower_sjis[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR to_upper_sjis[]= +static const uchar NEAR to_upper_sjis[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -140,7 +140,7 @@ static uchar NEAR to_upper_sjis[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR sort_order_sjis[]= +static const uchar NEAR sort_order_sjis[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -384,7 +384,7 @@ static my_bool my_like_range_sjis(CHARSET_INFO *cs __attribute__((unused)), } /* page 0 0x00A1-0x00DF */ -static uint16 tab_sjis_uni0[]={ +static const uint16 tab_sjis_uni0[]={ 0xFF61,0xFF62,0xFF63,0xFF64,0xFF65,0xFF66,0xFF67,0xFF68, 0xFF69,0xFF6A,0xFF6B,0xFF6C,0xFF6D,0xFF6E,0xFF6F,0xFF70, 0xFF71,0xFF72,0xFF73,0xFF74,0xFF75,0xFF76,0xFF77,0xFF78, @@ -395,7 +395,7 @@ static uint16 tab_sjis_uni0[]={ 0xFF99,0xFF9A,0xFF9B,0xFF9C,0xFF9D,0xFF9E,0xFF9F}; /* page 1 0x8140-0x84BE */ -static uint16 tab_sjis_uni1[]={ +static const uint16 tab_sjis_uni1[]={ 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, @@ -510,7 +510,7 @@ static uint16 tab_sjis_uni1[]={ 0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,0x2542}; /* page 2 0x889F-0x9FFC */ -static uint16 tab_sjis_uni2[]={ +static const uint16 tab_sjis_uni2[]={ 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, @@ -1261,7 +1261,7 @@ static uint16 tab_sjis_uni2[]={ 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; /* page 3 0xE040-0xEAA4 */ -static uint16 tab_sjis_uni3[]={ +static const uint16 tab_sjis_uni3[]={ 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, @@ -1608,7 +1608,7 @@ static int func_sjis_uni_onechar(int code){ return(0); } /* page 0 0x005C-0x00F7 */ -static uint16 tab_uni_sjis0[]={ +static const uint16 tab_uni_sjis0[]={ 0x815F, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1631,7 +1631,7 @@ static uint16 tab_uni_sjis0[]={ 0, 0, 0,0x8180}; /* page 1 0x0391-0x0451 */ -static uint16 tab_uni_sjis1[]={ +static const uint16 tab_uni_sjis1[]={ 0x839F,0x83A0,0x83A1,0x83A2,0x83A3,0x83A4,0x83A5,0x83A6, 0x83A7,0x83A8,0x83A9,0x83AA,0x83AB,0x83AC,0x83AD,0x83AE, 0x83AF, 0,0x83B0,0x83B1,0x83B2,0x83B3,0x83B4,0x83B5, @@ -1659,7 +1659,7 @@ static uint16 tab_uni_sjis1[]={ 0x8476}; /* page 2 0x2010-0x2312 */ -static uint16 tab_uni_sjis2[]={ +static const uint16 tab_uni_sjis2[]={ 0x815D, 0, 0, 0, 0,0x815C,0x8161, 0, 0x8165,0x8166, 0, 0,0x8167,0x8168, 0, 0, 0x81F5,0x81F6, 0, 0, 0,0x8164,0x8163, 0, @@ -1759,7 +1759,7 @@ static uint16 tab_uni_sjis2[]={ 0, 0,0x81DC}; /* page 3 0x2500-0x266F */ -static uint16 tab_uni_sjis3[]={ +static const uint16 tab_uni_sjis3[]={ 0x849F,0x84AA,0x84A0,0x84AB, 0, 0, 0, 0, 0, 0, 0, 0,0x84A1, 0, 0,0x84AC, 0x84A2, 0, 0,0x84AD,0x84A4, 0, 0,0x84AF, @@ -1809,7 +1809,7 @@ static uint16 tab_uni_sjis3[]={ }; /* page 4 0x3000-0x30FE */ -static uint16 tab_uni_sjis4[]={ +static const uint16 tab_uni_sjis4[]={ 0x8140,0x8141,0x8142,0x8156, 0,0x8158,0x8159,0x815A, 0x8171,0x8172,0x8173,0x8174,0x8175,0x8176,0x8177,0x8178, 0x8179,0x817A,0x81A7,0x81AC,0x816B,0x816C, 0, 0, @@ -1844,7 +1844,7 @@ static uint16 tab_uni_sjis4[]={ 0, 0, 0,0x8145,0x815B,0x8152,0x8153}; /* page 5 0x4E00-0x9481 */ -static uint16 tab_uni_sjis5[]={ +static const uint16 tab_uni_sjis5[]={ 0x88EA,0x929A, 0,0x8EB5, 0, 0, 0,0x969C, 0x8FE4,0x8E4F,0x8FE3,0x89BA, 0,0x9573,0x975E, 0, 0x98A0,0x894E, 0, 0,0x8A8E,0x98A1,0x90A2,0x99C0, @@ -4104,7 +4104,7 @@ static uint16 tab_uni_sjis5[]={ 0,0xE876}; /* page 6 0x9577-0x9FA0 */ -static uint16 tab_uni_sjis6[]={ +static const uint16 tab_uni_sjis6[]={ 0x92B7, 0, 0, 0, 0, 0, 0, 0, 0,0x96E5, 0,0xE878,0x914D, 0, 0, 0, 0xE879, 0,0x95C2,0xE87A,0x8A4A, 0, 0, 0, @@ -4433,7 +4433,7 @@ static uint16 tab_uni_sjis6[]={ 0,0xEA9E}; /* page 7 0xFF01-0xFFE5 */ -static uint16 tab_uni_sjis7[]={ +static const uint16 tab_uni_sjis7[]={ 0x8149, 0,0x8194,0x8190,0x8193,0x8195, 0,0x8169, 0x816A,0x8196,0x817B,0x8143, 0,0x8144,0x815E,0x824F, 0x8250,0x8251,0x8252,0x8253,0x8254,0x8255,0x8256,0x8257, @@ -4669,7 +4669,7 @@ static MY_CHARSET_HANDLER my_charset_handler= }; -CHARSET_INFO my_charset_sjis_japanese_ci= +struct charset_info_st my_charset_sjis_japanese_ci= { 13,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_NONASCII, /* state */ @@ -4701,7 +4701,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci= &my_collation_ci_handler }; -CHARSET_INFO my_charset_sjis_bin= +struct charset_info_st my_charset_sjis_bin= { 88,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NONASCII, /* state */ diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index a8c05dc4fd0..b956f1958e9 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -63,7 +63,7 @@ #define X L_MIDDLE -static int t_ctype[][TOT_LEVELS] = { +static const int t_ctype[][TOT_LEVELS] = { /*0x00*/ { IGNORE, IGNORE, IGNORE, IGNORE, X }, /*0x01*/ { IGNORE, IGNORE, IGNORE, IGNORE, X }, /*0x02*/ { IGNORE, IGNORE, IGNORE, IGNORE, X }, @@ -416,7 +416,7 @@ static uchar NEAR to_upper_tis620[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377', }; -static uchar NEAR sort_order_tis620[]= +static const uchar NEAR sort_order_tis620[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -476,7 +476,7 @@ static size_t thai2sortable(uchar *tstr, size_t len) if (isthai(c)) { - int *t_ctype0= t_ctype[c]; + const int *t_ctype0= t_ctype[c]; if (isconsnt(c)) l2bias -= 8; @@ -647,7 +647,7 @@ size_t my_strnxfrm_tis620(CHARSET_INFO *cs __attribute__((unused)), } -static unsigned short cs_to_uni[256]={ +static const unsigned short cs_to_uni[256]={ 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -681,7 +681,7 @@ static unsigned short cs_to_uni[256]={ 0x0E50,0x0E51,0x0E52,0x0E53,0x0E54,0x0E55,0x0E56,0x0E57, 0x0E58,0x0E59,0x0E5A,0x0E5B,0xFFFD,0xFFFD,0xFFFD,0xFFFD }; -static uchar pl00[256]={ +static const uchar pl00[256]={ 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -715,7 +715,7 @@ static uchar pl00[256]={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 }; -static uchar pl0E[256]={ +static const uchar pl0E[256]={ 0x0000,0x00A1,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7, 0x00A8,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF, 0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7, @@ -749,7 +749,7 @@ static uchar pl0E[256]={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 }; -static uchar plFF[256]={ +static const uchar plFF[256]={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -783,7 +783,7 @@ static uchar plFF[256]={ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x00FF,0x0000,0x0000 }; -static uchar *uni_to_cs[256]={ +static const uchar *const uni_to_cs[256]={ pl00,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL,NULL,NULL,pl0E,NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, @@ -838,7 +838,7 @@ int my_wc_mb_tis620(CHARSET_INFO *cs __attribute__((unused)), uchar *str, uchar *end __attribute__((unused))) { - uchar *pl; + const uchar *pl; if (str >= end) return MY_CS_TOOSMALL; @@ -897,7 +897,7 @@ static MY_CHARSET_HANDLER my_charset_handler= -CHARSET_INFO my_charset_tis620_thai_ci= +struct charset_info_st my_charset_tis620_thai_ci= { 18,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ @@ -929,7 +929,7 @@ CHARSET_INFO my_charset_tis620_thai_ci= &my_collation_ci_handler }; -CHARSET_INFO my_charset_tis620_bin= +struct charset_info_st my_charset_tis620_bin= { 89,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index b2a60265a0a..7f170ca3b40 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -31,7 +31,6 @@ - No combining marks processing is done */ - #include <my_global.h> #include "m_string.h" #include "m_ctype.h" @@ -49,7 +48,7 @@ #define MY_UCA_CMASK 255 #define MY_UCA_PSHIFT 8 -uint16 page000data[]= { /* 0000 (4 weights per char) */ +static const uint16 page000data[]= { /* 0000 (4 weights per char) */ 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, @@ -180,7 +179,7 @@ uint16 page000data[]= { /* 0000 (4 weights per char) */ 0x1094,0x0000,0x0000,0x0000, 0x105E,0x0000,0x0000,0x0000 }; -uint16 page001data[]= { /* 0100 (3 weights per char) */ +static const uint16 page001data[]= { /* 0100 (3 weights per char) */ 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E60,0x0000,0x0000, 0x0E60,0x0000,0x0000, 0x0E60,0x0000,0x0000, @@ -268,7 +267,7 @@ uint16 page001data[]= { /* 0100 (3 weights per char) */ 0x0E38,0x0000,0x0000, 0x0E38,0x0000,0x0000, 0x0F8D,0x0000,0x0000, 0x0F8D,0x0000,0x0000 }; -uint16 page002data[]= { /* 0200 (3 weights per char) */ +static const uint16 page002data[]= { /* 0200 (3 weights per char) */ 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E8B,0x0000,0x0000, 0x0E8B,0x0000,0x0000, 0x0E8B,0x0000,0x0000, 0x0E8B,0x0000,0x0000, 0x0EFB,0x0000,0x0000, @@ -356,7 +355,7 @@ uint16 page002data[]= { /* 0200 (3 weights per char) */ 0x0346,0x0000,0x0000, 0x0347,0x0000,0x0000, 0x0348,0x0000,0x0000, 0x0349,0x0000,0x0000 }; -uint16 page003data[]= { /* 0300 (4 weights per char) */ +static const uint16 page003data[]= { /* 0300 (4 weights per char) */ 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000, @@ -487,7 +486,7 @@ uint16 page003data[]= { /* 0300 (4 weights per char) */ 0xFBC0,0x83FE,0x0000,0x0000, 0xFBC0,0x83FF,0x0000,0x0000 }; -uint16 page004data[]= { /* 0400 (3 weights per char) */ +static const uint16 page004data[]= { /* 0400 (3 weights per char) */ 0x1152,0x0000,0x0000, 0x1152,0x0000,0x0000, 0x1145,0x0000,0x0000, 0x114A,0x0000,0x0000, 0x115A,0x0000,0x0000, 0x1173,0x0000,0x0000, 0x1188,0x0000,0x0000, 0x118C,0x0000,0x0000, 0x1194,0x0000,0x0000, @@ -575,7 +574,7 @@ uint16 page004data[]= { /* 0400 (3 weights per char) */ 0xFBC0,0x84FC,0x0000, 0xFBC0,0x84FD,0x0000, 0xFBC0,0x84FE,0x0000, 0xFBC0,0x84FF,0x0000 }; -uint16 page005data[]= { /* 0500 (3 weights per char) */ +static const uint16 page005data[]= { /* 0500 (3 weights per char) */ 0x1144,0x0000,0x0000, 0x1144,0x0000,0x0000, 0x1149,0x0000,0x0000, 0x1149,0x0000,0x0000, 0x116E,0x0000,0x0000, 0x116E,0x0000,0x0000, 0x117B,0x0000,0x0000, 0x117B,0x0000,0x0000, 0x11BD,0x0000,0x0000, @@ -663,7 +662,7 @@ uint16 page005data[]= { /* 0500 (3 weights per char) */ 0xFBC0,0x85FC,0x0000, 0xFBC0,0x85FD,0x0000, 0xFBC0,0x85FE,0x0000, 0xFBC0,0x85FF,0x0000 }; -uint16 page006data[]= { /* 0600 (3 weights per char) */ +static const uint16 page006data[]= { /* 0600 (3 weights per char) */ 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0xFBC0,0x8604,0x0000, 0xFBC0,0x8605,0x0000, 0xFBC0,0x8606,0x0000, 0xFBC0,0x8607,0x0000, 0xFBC0,0x8608,0x0000, @@ -751,7 +750,7 @@ uint16 page006data[]= { /* 0600 (3 weights per char) */ 0x1392,0x0000,0x0000, 0x1347,0x0000,0x0000, 0x13B0,0x0000,0x0000, 0x13BB,0x0000,0x0000 }; -uint16 page007data[]= { /* 0700 (3 weights per char) */ +static const uint16 page007data[]= { /* 0700 (3 weights per char) */ 0x0270,0x0000,0x0000, 0x0260,0x0000,0x0000, 0x0261,0x0000,0x0000, 0x023F,0x0000,0x0000, 0x0240,0x0000,0x0000, 0x0241,0x0000,0x0000, 0x0242,0x0000,0x0000, 0x0243,0x0000,0x0000, 0x0244,0x0000,0x0000, @@ -839,7 +838,7 @@ uint16 page007data[]= { /* 0700 (3 weights per char) */ 0xFBC0,0x87FC,0x0000, 0xFBC0,0x87FD,0x0000, 0xFBC0,0x87FE,0x0000, 0xFBC0,0x87FF,0x0000 }; -uint16 page009data[]= { /* 0900 (3 weights per char) */ +static const uint16 page009data[]= { /* 0900 (3 weights per char) */ 0xFBC0,0x8900,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x155A,0x0000,0x0000, 0x155B,0x0000,0x0000, 0x155C,0x0000,0x0000, 0x155D,0x0000,0x0000, 0x155E,0x0000,0x0000, @@ -927,7 +926,7 @@ uint16 page009data[]= { /* 0900 (3 weights per char) */ 0xFBC0,0x89FC,0x0000, 0xFBC0,0x89FD,0x0000, 0xFBC0,0x89FE,0x0000, 0xFBC0,0x89FF,0x0000 }; -uint16 page00Adata[]= { /* 0A00 (3 weights per char) */ +static const uint16 page00Adata[]= { /* 0A00 (3 weights per char) */ 0xFBC0,0x8A00,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0xFBC0,0x8A04,0x0000, 0x15E7,0x0000,0x0000, 0x15E8,0x0000,0x0000, 0x15EC,0x0000,0x0000, 0x15ED,0x0000,0x0000, @@ -1015,7 +1014,7 @@ uint16 page00Adata[]= { /* 0A00 (3 weights per char) */ 0xFBC0,0x8AFC,0x0000, 0xFBC0,0x8AFD,0x0000, 0xFBC0,0x8AFE,0x0000, 0xFBC0,0x8AFF,0x0000 }; -uint16 page00Bdata[]= { /* 0B00 (3 weights per char) */ +static const uint16 page00Bdata[]= { /* 0B00 (3 weights per char) */ 0xFBC0,0x8B00,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0xFBC0,0x8B04,0x0000, 0x165D,0x0000,0x0000, 0x165E,0x0000,0x0000, 0x165F,0x0000,0x0000, 0x1660,0x0000,0x0000, @@ -1103,7 +1102,7 @@ uint16 page00Bdata[]= { /* 0B00 (3 weights per char) */ 0xFBC0,0x8BFC,0x0000, 0xFBC0,0x8BFD,0x0000, 0xFBC0,0x8BFE,0x0000, 0xFBC0,0x8BFF,0x0000 }; -uint16 page00Cdata[]= { /* 0C00 (3 weights per char) */ +static const uint16 page00Cdata[]= { /* 0C00 (3 weights per char) */ 0xFBC0,0x8C00,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0xFBC0,0x8C04,0x0000, 0x16CD,0x0000,0x0000, 0x16CE,0x0000,0x0000, 0x16CF,0x0000,0x0000, 0x16D0,0x0000,0x0000, @@ -1191,7 +1190,7 @@ uint16 page00Cdata[]= { /* 0C00 (3 weights per char) */ 0xFBC0,0x8CFC,0x0000, 0xFBC0,0x8CFD,0x0000, 0xFBC0,0x8CFE,0x0000, 0xFBC0,0x8CFF,0x0000 }; -uint16 page00Ddata[]= { /* 0D00 (3 weights per char) */ +static const uint16 page00Ddata[]= { /* 0D00 (3 weights per char) */ 0xFBC0,0x8D00,0x0000, 0xFBC0,0x8D01,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0xFBC0,0x8D04,0x0000, 0x1755,0x0000,0x0000, 0x1756,0x0000,0x0000, 0x1757,0x0000,0x0000, 0x1758,0x0000,0x0000, @@ -1279,7 +1278,7 @@ uint16 page00Ddata[]= { /* 0D00 (3 weights per char) */ 0xFBC0,0x8DFC,0x0000, 0xFBC0,0x8DFD,0x0000, 0xFBC0,0x8DFE,0x0000, 0xFBC0,0x8DFF,0x0000 }; -uint16 page00Edata[]= { /* 0E00 (3 weights per char) */ +static const uint16 page00Edata[]= { /* 0E00 (3 weights per char) */ 0xFBC0,0x8E00,0x0000, 0x17E4,0x0000,0x0000, 0x17E5,0x0000,0x0000, 0x17E6,0x0000,0x0000, 0x17E7,0x0000,0x0000, 0x17E8,0x0000,0x0000, 0x17E9,0x0000,0x0000, 0x17EA,0x0000,0x0000, 0x17EB,0x0000,0x0000, @@ -1367,7 +1366,7 @@ uint16 page00Edata[]= { /* 0E00 (3 weights per char) */ 0xFBC0,0x8EFC,0x0000, 0xFBC0,0x8EFD,0x0000, 0xFBC0,0x8EFE,0x0000, 0xFBC0,0x8EFF,0x0000 }; -uint16 page00Fdata[]= { /* 0F00 (3 weights per char) */ +static const uint16 page00Fdata[]= { /* 0F00 (3 weights per char) */ 0x189A,0x18AD,0x0000, 0x035A,0x0000,0x0000, 0x035B,0x0000,0x0000, 0x035C,0x0000,0x0000, 0x02FE,0x0000,0x0000, 0x02FF,0x0000,0x0000, 0x0300,0x0000,0x0000, 0x0301,0x0000,0x0000, 0x0302,0x0000,0x0000, @@ -1455,7 +1454,7 @@ uint16 page00Fdata[]= { /* 0F00 (3 weights per char) */ 0xFBC0,0x8FFC,0x0000, 0xFBC0,0x8FFD,0x0000, 0xFBC0,0x8FFE,0x0000, 0xFBC0,0x8FFF,0x0000 }; -uint16 page010data[]= { /* 1000 (3 weights per char) */ +static const uint16 page010data[]= { /* 1000 (3 weights per char) */ 0x1931,0x0000,0x0000, 0x1932,0x0000,0x0000, 0x1933,0x0000,0x0000, 0x1934,0x0000,0x0000, 0x1935,0x0000,0x0000, 0x1936,0x0000,0x0000, 0x1937,0x0000,0x0000, 0x1938,0x0000,0x0000, 0x1939,0x0000,0x0000, @@ -1543,7 +1542,7 @@ uint16 page010data[]= { /* 1000 (3 weights per char) */ 0xFBC0,0x90FC,0x0000, 0xFBC0,0x90FD,0x0000, 0xFBC0,0x90FE,0x0000, 0xFBC0,0x90FF,0x0000 }; -uint16 page011data[]= { /* 1100 (3 weights per char) */ +static const uint16 page011data[]= { /* 1100 (3 weights per char) */ 0x1D62,0x0000,0x0000, 0x1D63,0x0000,0x0000, 0x1D64,0x0000,0x0000, 0x1D65,0x0000,0x0000, 0x1D66,0x0000,0x0000, 0x1D67,0x0000,0x0000, 0x1D68,0x0000,0x0000, 0x1D69,0x0000,0x0000, 0x1D6A,0x0000,0x0000, @@ -1631,7 +1630,7 @@ uint16 page011data[]= { /* 1100 (3 weights per char) */ 0xFBC0,0x91FC,0x0000, 0xFBC0,0x91FD,0x0000, 0xFBC0,0x91FE,0x0000, 0xFBC0,0x91FF,0x0000 }; -uint16 page012data[]= { /* 1200 (3 weights per char) */ +static const uint16 page012data[]= { /* 1200 (3 weights per char) */ 0x141C,0x0000,0x0000, 0x141D,0x0000,0x0000, 0x141E,0x0000,0x0000, 0x141F,0x0000,0x0000, 0x1420,0x0000,0x0000, 0x1421,0x0000,0x0000, 0x1422,0x0000,0x0000, 0xFBC0,0x9207,0x0000, 0x1423,0x0000,0x0000, @@ -1719,7 +1718,7 @@ uint16 page012data[]= { /* 1200 (3 weights per char) */ 0x1500,0x0000,0x0000, 0x1501,0x0000,0x0000, 0x1502,0x0000,0x0000, 0x1503,0x0000,0x0000 }; -uint16 page013data[]= { /* 1300 (3 weights per char) */ +static const uint16 page013data[]= { /* 1300 (3 weights per char) */ 0x1504,0x0000,0x0000, 0x1505,0x0000,0x0000, 0x1506,0x0000,0x0000, 0x1507,0x0000,0x0000, 0x1508,0x0000,0x0000, 0x1509,0x0000,0x0000, 0x150A,0x0000,0x0000, 0x150B,0x0000,0x0000, 0x150C,0x0000,0x0000, @@ -1807,7 +1806,7 @@ uint16 page013data[]= { /* 1300 (3 weights per char) */ 0xFBC0,0x93FC,0x0000, 0xFBC0,0x93FD,0x0000, 0xFBC0,0x93FE,0x0000, 0xFBC0,0x93FF,0x0000 }; -uint16 page014data[]= { /* 1400 (3 weights per char) */ +static const uint16 page014data[]= { /* 1400 (3 weights per char) */ 0xFBC0,0x9400,0x0000, 0x1AAE,0x0000,0x0000, 0x1AAF,0x0000,0x0000, 0x1AB0,0x0000,0x0000, 0x1AB1,0x0000,0x0000, 0x1AB2,0x0000,0x0000, 0x1AB3,0x0000,0x0000, 0x1AB4,0x0000,0x0000, 0x1AB5,0x0000,0x0000, @@ -1895,7 +1894,7 @@ uint16 page014data[]= { /* 1400 (3 weights per char) */ 0x1BA9,0x0000,0x0000, 0x1BAA,0x0000,0x0000, 0x1BAB,0x0000,0x0000, 0x1BAC,0x0000,0x0000 }; -uint16 page015data[]= { /* 1500 (2 weights per char) */ +static const uint16 page015data[]= { /* 1500 (2 weights per char) */ 0x1BAD,0x0000, 0x1BAE,0x0000, 0x1BAF,0x0000, 0x1BB0,0x0000, 0x1BB1,0x0000, 0x1BB2,0x0000, 0x1BB3,0x0000, 0x1BB4,0x0000, 0x1BB5,0x0000, 0x1BB6,0x0000, 0x1BB7,0x0000, 0x1BB8,0x0000, @@ -1962,7 +1961,7 @@ uint16 page015data[]= { /* 1500 (2 weights per char) */ 0x1CB1,0x0000, 0x1CB2,0x0000, 0x1CB3,0x0000, 0x1CB4,0x0000 }; -uint16 page016data[]= { /* 1600 (3 weights per char) */ +static const uint16 page016data[]= { /* 1600 (3 weights per char) */ 0x1CB5,0x0000,0x0000, 0x1CB6,0x0000,0x0000, 0x1CB7,0x0000,0x0000, 0x1CB8,0x0000,0x0000, 0x1CB9,0x0000,0x0000, 0x1CBA,0x0000,0x0000, 0x1CBB,0x0000,0x0000, 0x1CBC,0x0000,0x0000, 0x1CBD,0x0000,0x0000, @@ -2050,7 +2049,7 @@ uint16 page016data[]= { /* 1600 (3 weights per char) */ 0xFBC0,0x96FC,0x0000, 0xFBC0,0x96FD,0x0000, 0xFBC0,0x96FE,0x0000, 0xFBC0,0x96FF,0x0000 }; -uint16 page017data[]= { /* 1700 (3 weights per char) */ +static const uint16 page017data[]= { /* 1700 (3 weights per char) */ 0x18E2,0x0000,0x0000, 0x18E3,0x0000,0x0000, 0x18E4,0x0000,0x0000, 0x18E5,0x0000,0x0000, 0x18E6,0x0000,0x0000, 0x18E7,0x0000,0x0000, 0x18E8,0x0000,0x0000, 0x18E9,0x0000,0x0000, 0x18EA,0x0000,0x0000, @@ -2138,7 +2137,7 @@ uint16 page017data[]= { /* 1700 (3 weights per char) */ 0xFBC0,0x97FC,0x0000, 0xFBC0,0x97FD,0x0000, 0xFBC0,0x97FE,0x0000, 0xFBC0,0x97FF,0x0000 }; -uint16 page018data[]= { /* 1800 (3 weights per char) */ +static const uint16 page018data[]= { /* 1800 (3 weights per char) */ 0x02F8,0x0000,0x0000, 0x025E,0x0000,0x0000, 0x0235,0x0000,0x0000, 0x0263,0x0000,0x0000, 0x024A,0x0000,0x0000, 0x024B,0x0000,0x0000, 0x0223,0x0000,0x0000, 0x0224,0x0000,0x0000, 0x0236,0x0000,0x0000, @@ -2226,7 +2225,7 @@ uint16 page018data[]= { /* 1800 (3 weights per char) */ 0xFBC0,0x98FC,0x0000, 0xFBC0,0x98FD,0x0000, 0xFBC0,0x98FE,0x0000, 0xFBC0,0x98FF,0x0000 }; -uint16 page019data[]= { /* 1900 (3 weights per char) */ +static const uint16 page019data[]= { /* 1900 (3 weights per char) */ 0x18B0,0x0000,0x0000, 0x18B1,0x0000,0x0000, 0x18B2,0x0000,0x0000, 0x18B3,0x0000,0x0000, 0x18B4,0x0000,0x0000, 0x18B5,0x0000,0x0000, 0x18B6,0x0000,0x0000, 0x18B7,0x0000,0x0000, 0x18B8,0x0000,0x0000, @@ -2314,7 +2313,7 @@ uint16 page019data[]= { /* 1900 (3 weights per char) */ 0x0397,0x0000,0x0000, 0x0398,0x0000,0x0000, 0x0399,0x0000,0x0000, 0x039A,0x0000,0x0000 }; -uint16 page01Ddata[]= { /* 1D00 (3 weights per char) */ +static const uint16 page01Ddata[]= { /* 1D00 (3 weights per char) */ 0x0E37,0x0000,0x0000, 0x0E3C,0x0000,0x0000, 0x0E3D,0x0000,0x0000, 0x0E57,0x0000,0x0000, 0x0E64,0x0000,0x0000, 0x0E71,0x0000,0x0000, 0x0E8A,0x0000,0x0000, 0x0E8F,0x0000,0x0000, 0x0EA8,0x0000,0x0000, @@ -2402,7 +2401,7 @@ uint16 page01Ddata[]= { /* 1D00 (3 weights per char) */ 0xFBC0,0x9DFC,0x0000, 0xFBC0,0x9DFD,0x0000, 0xFBC0,0x9DFE,0x0000, 0xFBC0,0x9DFF,0x0000 }; -uint16 page01Edata[]= { /* 1E00 (3 weights per char) */ +static const uint16 page01Edata[]= { /* 1E00 (3 weights per char) */ 0x0E33,0x0000,0x0000, 0x0E33,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E4A,0x0000,0x0000, 0x0E60,0x0000,0x0000, @@ -2490,7 +2489,7 @@ uint16 page01Edata[]= { /* 1E00 (3 weights per char) */ 0xFBC0,0x9EFC,0x0000, 0xFBC0,0x9EFD,0x0000, 0xFBC0,0x9EFE,0x0000, 0xFBC0,0x9EFF,0x0000 }; -uint16 page01Fdata[]= { /* 1F00 (3 weights per char) */ +static const uint16 page01Fdata[]= { /* 1F00 (3 weights per char) */ 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, 0x10E8,0x0000,0x0000, @@ -2578,7 +2577,7 @@ uint16 page01Fdata[]= { /* 1F00 (3 weights per char) */ 0x1109,0x0000,0x0000, 0x020D,0x0000,0x0000, 0x0218,0x0000,0x0000, 0xFBC0,0x9FFF,0x0000 }; -uint16 page020data[]= { /* 2000 (5 weights per char) */ +static const uint16 page020data[]= { /* 2000 (5 weights per char) */ 0x0209,0x0000,0x0000,0x0000,0x0000, 0x0209,0x0000,0x0000,0x0000,0x0000, 0x0209,0x0000,0x0000,0x0000,0x0000, @@ -2837,7 +2836,7 @@ uint16 page020data[]= { /* 2000 (5 weights per char) */ 0xFBC0,0xA0FF,0x0000,0x0000,0x0000 }; -uint16 page021data[]= { /* 2100 (5 weights per char) */ +static const uint16 page021data[]= { /* 2100 (5 weights per char) */ 0x0E33,0x02CC,0x0E60,0x0000,0x0000, 0x0E33,0x02CC,0x0FEA,0x0000,0x0000, 0x0E60,0x0000,0x0000,0x0000,0x0000, @@ -3096,7 +3095,7 @@ uint16 page021data[]= { /* 2100 (5 weights per char) */ 0x0417,0x0000,0x0000,0x0000,0x0000 }; -uint16 page022data[]= { /* 2200 (4 weights per char) */ +static const uint16 page022data[]= { /* 2200 (4 weights per char) */ 0x0418,0x0000,0x0000,0x0000, 0x0419,0x0000,0x0000,0x0000, 0x041A,0x0000,0x0000,0x0000, 0x041B,0x0000,0x0000,0x0000, 0x041B,0x0000,0x0000,0x0000, 0x041C,0x0000,0x0000,0x0000, @@ -3227,7 +3226,7 @@ uint16 page022data[]= { /* 2200 (4 weights per char) */ 0x04F9,0x0000,0x0000,0x0000, 0x04FA,0x0000,0x0000,0x0000 }; -uint16 page023data[]= { /* 2300 (3 weights per char) */ +static const uint16 page023data[]= { /* 2300 (3 weights per char) */ 0x04FB,0x0000,0x0000, 0x04FC,0x0000,0x0000, 0x04FD,0x0000,0x0000, 0x04FE,0x0000,0x0000, 0x04FF,0x0000,0x0000, 0x0500,0x0000,0x0000, 0x0501,0x0000,0x0000, 0x0502,0x0000,0x0000, 0x0503,0x0000,0x0000, @@ -3315,7 +3314,7 @@ uint16 page023data[]= { /* 2300 (3 weights per char) */ 0xFBC0,0xA3FC,0x0000, 0xFBC0,0xA3FD,0x0000, 0xFBC0,0xA3FE,0x0000, 0xFBC0,0xA3FF,0x0000 }; -uint16 page024data[]= { /* 2400 (5 weights per char) */ +static const uint16 page024data[]= { /* 2400 (5 weights per char) */ 0x05CA,0x0000,0x0000,0x0000,0x0000, 0x05CB,0x0000,0x0000,0x0000,0x0000, 0x05CC,0x0000,0x0000,0x0000,0x0000, @@ -3574,7 +3573,7 @@ uint16 page024data[]= { /* 2400 (5 weights per char) */ 0x0E29,0x0000,0x0000,0x0000,0x0000 }; -uint16 page025data[]= { /* 2500 (2 weights per char) */ +static const uint16 page025data[]= { /* 2500 (2 weights per char) */ 0x05FC,0x0000, 0x05FD,0x0000, 0x05FE,0x0000, 0x05FF,0x0000, 0x0600,0x0000, 0x0601,0x0000, 0x0602,0x0000, 0x0603,0x0000, 0x0604,0x0000, 0x0605,0x0000, 0x0606,0x0000, 0x0607,0x0000, @@ -3641,7 +3640,7 @@ uint16 page025data[]= { /* 2500 (2 weights per char) */ 0x06F8,0x0000, 0x06F9,0x0000, 0x06FA,0x0000, 0x06FB,0x0000 }; -uint16 page026data[]= { /* 2600 (3 weights per char) */ +static const uint16 page026data[]= { /* 2600 (3 weights per char) */ 0x06FC,0x0000,0x0000, 0x06FD,0x0000,0x0000, 0x06FE,0x0000,0x0000, 0x06FF,0x0000,0x0000, 0x0700,0x0000,0x0000, 0x0701,0x0000,0x0000, 0x0702,0x0000,0x0000, 0x0703,0x0000,0x0000, 0x0704,0x0000,0x0000, @@ -3729,7 +3728,7 @@ uint16 page026data[]= { /* 2600 (3 weights per char) */ 0xFBC0,0xA6FC,0x0000, 0xFBC0,0xA6FD,0x0000, 0xFBC0,0xA6FE,0x0000, 0xFBC0,0xA6FF,0x0000 }; -uint16 page027data[]= { /* 2700 (3 weights per char) */ +static const uint16 page027data[]= { /* 2700 (3 weights per char) */ 0xFBC0,0xA700,0x0000, 0x077C,0x0000,0x0000, 0x077D,0x0000,0x0000, 0x077E,0x0000,0x0000, 0x077F,0x0000,0x0000, 0xFBC0,0xA705,0x0000, 0x0780,0x0000,0x0000, 0x0781,0x0000,0x0000, 0x0782,0x0000,0x0000, @@ -3817,7 +3816,7 @@ uint16 page027data[]= { /* 2700 (3 weights per char) */ 0x0834,0x0000,0x0000, 0x0835,0x0000,0x0000, 0x0836,0x0000,0x0000, 0x0837,0x0000,0x0000 }; -uint16 page028data[]= { /* 2800 (2 weights per char) */ +static const uint16 page028data[]= { /* 2800 (2 weights per char) */ 0x0A29,0x0000, 0x0A2A,0x0000, 0x0A2B,0x0000, 0x0A2C,0x0000, 0x0A2D,0x0000, 0x0A2E,0x0000, 0x0A2F,0x0000, 0x0A30,0x0000, 0x0A31,0x0000, 0x0A32,0x0000, 0x0A33,0x0000, 0x0A34,0x0000, @@ -3884,7 +3883,7 @@ uint16 page028data[]= { /* 2800 (2 weights per char) */ 0x0B25,0x0000, 0x0B26,0x0000, 0x0B27,0x0000, 0x0B28,0x0000 }; -uint16 page029data[]= { /* 2900 (2 weights per char) */ +static const uint16 page029data[]= { /* 2900 (2 weights per char) */ 0x0838,0x0000, 0x0839,0x0000, 0x083A,0x0000, 0x083B,0x0000, 0x083C,0x0000, 0x083D,0x0000, 0x083E,0x0000, 0x083F,0x0000, 0x0840,0x0000, 0x0841,0x0000, 0x0842,0x0000, 0x0843,0x0000, @@ -3951,7 +3950,7 @@ uint16 page029data[]= { /* 2900 (2 weights per char) */ 0x0296,0x0000, 0x0297,0x0000, 0x091E,0x0000, 0x091F,0x0000 }; -uint16 page02Adata[]= { /* 2A00 (5 weights per char) */ +static const uint16 page02Adata[]= { /* 2A00 (5 weights per char) */ 0x0920,0x0000,0x0000,0x0000,0x0000, 0x0921,0x0000,0x0000,0x0000,0x0000, 0x0922,0x0000,0x0000,0x0000,0x0000, @@ -4210,7 +4209,7 @@ uint16 page02Adata[]= { /* 2A00 (5 weights per char) */ 0x0A1A,0x0000,0x0000,0x0000,0x0000 }; -uint16 page02Bdata[]= { /* 2B00 (3 weights per char) */ +static const uint16 page02Bdata[]= { /* 2B00 (3 weights per char) */ 0x0A1B,0x0000,0x0000, 0x0A1C,0x0000,0x0000, 0x0A1D,0x0000,0x0000, 0x0A1E,0x0000,0x0000, 0x0A1F,0x0000,0x0000, 0x0A20,0x0000,0x0000, 0x0A21,0x0000,0x0000, 0x0A22,0x0000,0x0000, 0x0A23,0x0000,0x0000, @@ -4298,7 +4297,7 @@ uint16 page02Bdata[]= { /* 2B00 (3 weights per char) */ 0xFBC0,0xABFC,0x0000, 0xFBC0,0xABFD,0x0000, 0xFBC0,0xABFE,0x0000, 0xFBC0,0xABFF,0x0000 }; -uint16 page02Edata[]= { /* 2E00 (3 weights per char) */ +static const uint16 page02Edata[]= { /* 2E00 (3 weights per char) */ 0xFBC0,0xAE00,0x0000, 0xFBC0,0xAE01,0x0000, 0xFBC0,0xAE02,0x0000, 0xFBC0,0xAE03,0x0000, 0xFBC0,0xAE04,0x0000, 0xFBC0,0xAE05,0x0000, 0xFBC0,0xAE06,0x0000, 0xFBC0,0xAE07,0x0000, 0xFBC0,0xAE08,0x0000, @@ -4386,7 +4385,7 @@ uint16 page02Edata[]= { /* 2E00 (3 weights per char) */ 0xFBC0,0xAEFC,0x0000, 0xFBC0,0xAEFD,0x0000, 0xFBC0,0xAEFE,0x0000, 0xFBC0,0xAEFF,0x0000 }; -uint16 page02Fdata[]= { /* 2F00 (3 weights per char) */ +static const uint16 page02Fdata[]= { /* 2F00 (3 weights per char) */ 0xFB40,0xCE00,0x0000, 0xFB40,0xCE28,0x0000, 0xFB40,0xCE36,0x0000, 0xFB40,0xCE3F,0x0000, 0xFB40,0xCE59,0x0000, 0xFB40,0xCE85,0x0000, 0xFB40,0xCE8C,0x0000, 0xFB40,0xCEA0,0x0000, 0xFB40,0xCEBA,0x0000, @@ -4474,7 +4473,7 @@ uint16 page02Fdata[]= { /* 2F00 (3 weights per char) */ 0xFBC0,0xAFFC,0x0000, 0xFBC0,0xAFFD,0x0000, 0xFBC0,0xAFFE,0x0000, 0xFBC0,0xAFFF,0x0000 }; -uint16 page030data[]= { /* 3000 (3 weights per char) */ +static const uint16 page030data[]= { /* 3000 (3 weights per char) */ 0x0209,0x0000,0x0000, 0x0237,0x0000,0x0000, 0x0266,0x0000,0x0000, 0x02E2,0x0000,0x0000, 0x0DBB,0x0000,0x0000, 0x0E05,0x0000,0x0000, 0x1E5D,0x1E73,0x0000, 0x0E29,0x0000,0x0000, 0x02AE,0x0000,0x0000, @@ -4562,7 +4561,7 @@ uint16 page030data[]= { /* 3000 (3 weights per char) */ 0x0E0B,0x0000,0x0000, 0x0E0C,0x0000,0x0000, 0x0E0C,0x0000,0x0000, 0x1E5B,0x1E65,0x0000 }; -uint16 page031data[]= { /* 3100 (3 weights per char) */ +static const uint16 page031data[]= { /* 3100 (3 weights per char) */ 0xFBC0,0xB100,0x0000, 0xFBC0,0xB101,0x0000, 0xFBC0,0xB102,0x0000, 0xFBC0,0xB103,0x0000, 0xFBC0,0xB104,0x0000, 0x1E82,0x0000,0x0000, 0x1E83,0x0000,0x0000, 0x1E84,0x0000,0x0000, 0x1E85,0x0000,0x0000, @@ -4650,7 +4649,7 @@ uint16 page031data[]= { /* 3100 (3 weights per char) */ 0x1E79,0x0000,0x0000, 0x1E7A,0x0000,0x0000, 0x1E7B,0x0000,0x0000, 0x1E7C,0x0000,0x0000 }; -uint16 page032data[]= { /* 3200 (8 weights per char) */ +static const uint16 page032data[]= { /* 3200 (8 weights per char) */ 0x0288,0x1D62,0x0289,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0288,0x1D64,0x0289,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0288,0x1D65,0x0289,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -4909,7 +4908,7 @@ uint16 page032data[]= { /* 3200 (8 weights per char) */ 0xFBC0,0xB2FF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 }; -uint16 page033data[]= { /* 3300 (9 weights per char) */ +static const uint16 page033data[]= { /* 3300 (9 weights per char) */ 0x1E52,0x1E6B,0x0E0B,0x1E65,0x0000,0x0000,0x0000,0x0000,0x0000, 0x1E52,0x1E7A,0x1E6D,0x1E52,0x0000,0x0000,0x0000,0x0000,0x0000, 0x1E52,0x1E81,0x1E6E,0x1E52,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -5168,7 +5167,7 @@ uint16 page033data[]= { /* 3300 (9 weights per char) */ 0x0EC1,0x0E33,0x0F2E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 }; -uint16 page04Ddata[]= { /* 4D00 (3 weights per char) */ +static const uint16 page04Ddata[]= { /* 4D00 (3 weights per char) */ 0xFB80,0xCD00,0x0000, 0xFB80,0xCD01,0x0000, 0xFB80,0xCD02,0x0000, 0xFB80,0xCD03,0x0000, 0xFB80,0xCD04,0x0000, 0xFB80,0xCD05,0x0000, 0xFB80,0xCD06,0x0000, 0xFB80,0xCD07,0x0000, 0xFB80,0xCD08,0x0000, @@ -5256,7 +5255,7 @@ uint16 page04Ddata[]= { /* 4D00 (3 weights per char) */ 0x0B73,0x0000,0x0000, 0x0B74,0x0000,0x0000, 0x0B75,0x0000,0x0000, 0x0B76,0x0000,0x0000 }; -uint16 page0A0data[]= { /* A000 (2 weights per char) */ +static const uint16 page0A0data[]= { /* A000 (2 weights per char) */ 0x1EB1,0x0000, 0x1EB2,0x0000, 0x1EB3,0x0000, 0x1EB4,0x0000, 0x1EB5,0x0000, 0x1EB6,0x0000, 0x1EB7,0x0000, 0x1EB8,0x0000, 0x1EB9,0x0000, 0x1EBA,0x0000, 0x1EBB,0x0000, 0x1EBC,0x0000, @@ -5323,7 +5322,7 @@ uint16 page0A0data[]= { /* A000 (2 weights per char) */ 0x1FAD,0x0000, 0x1FAE,0x0000, 0x1FAF,0x0000, 0x1FB0,0x0000 }; -uint16 page0A1data[]= { /* A100 (2 weights per char) */ +static const uint16 page0A1data[]= { /* A100 (2 weights per char) */ 0x1FB1,0x0000, 0x1FB2,0x0000, 0x1FB3,0x0000, 0x1FB4,0x0000, 0x1FB5,0x0000, 0x1FB6,0x0000, 0x1FB7,0x0000, 0x1FB8,0x0000, 0x1FB9,0x0000, 0x1FBA,0x0000, 0x1FBB,0x0000, 0x1FBC,0x0000, @@ -5390,7 +5389,7 @@ uint16 page0A1data[]= { /* A100 (2 weights per char) */ 0x20AD,0x0000, 0x20AE,0x0000, 0x20AF,0x0000, 0x20B0,0x0000 }; -uint16 page0A2data[]= { /* A200 (2 weights per char) */ +static const uint16 page0A2data[]= { /* A200 (2 weights per char) */ 0x20B1,0x0000, 0x20B2,0x0000, 0x20B3,0x0000, 0x20B4,0x0000, 0x20B5,0x0000, 0x20B6,0x0000, 0x20B7,0x0000, 0x20B8,0x0000, 0x20B9,0x0000, 0x20BA,0x0000, 0x20BB,0x0000, 0x20BC,0x0000, @@ -5457,7 +5456,7 @@ uint16 page0A2data[]= { /* A200 (2 weights per char) */ 0x21AD,0x0000, 0x21AE,0x0000, 0x21AF,0x0000, 0x21B0,0x0000 }; -uint16 page0A3data[]= { /* A300 (2 weights per char) */ +static const uint16 page0A3data[]= { /* A300 (2 weights per char) */ 0x21B1,0x0000, 0x21B2,0x0000, 0x21B3,0x0000, 0x21B4,0x0000, 0x21B5,0x0000, 0x21B6,0x0000, 0x21B7,0x0000, 0x21B8,0x0000, 0x21B9,0x0000, 0x21BA,0x0000, 0x21BB,0x0000, 0x21BC,0x0000, @@ -5524,7 +5523,7 @@ uint16 page0A3data[]= { /* A300 (2 weights per char) */ 0x22AD,0x0000, 0x22AE,0x0000, 0x22AF,0x0000, 0x22B0,0x0000 }; -uint16 page0A4data[]= { /* A400 (3 weights per char) */ +static const uint16 page0A4data[]= { /* A400 (3 weights per char) */ 0x22B1,0x0000,0x0000, 0x22B2,0x0000,0x0000, 0x22B3,0x0000,0x0000, 0x22B4,0x0000,0x0000, 0x22B5,0x0000,0x0000, 0x22B6,0x0000,0x0000, 0x22B7,0x0000,0x0000, 0x22B8,0x0000,0x0000, 0x22B9,0x0000,0x0000, @@ -5612,7 +5611,7 @@ uint16 page0A4data[]= { /* A400 (3 weights per char) */ 0xFBC1,0xA4FC,0x0000, 0xFBC1,0xA4FD,0x0000, 0xFBC1,0xA4FE,0x0000, 0xFBC1,0xA4FF,0x0000 }; -uint16 page0F9data[]= { /* F900 (3 weights per char) */ +static const uint16 page0F9data[]= { /* F900 (3 weights per char) */ 0xFB41,0x8C48,0x0000, 0xFB40,0xE6F4,0x0000, 0xFB41,0x8ECA,0x0000, 0xFB41,0x8CC8,0x0000, 0xFB40,0xEED1,0x0000, 0xFB40,0xCE32,0x0000, 0xFB40,0xD3E5,0x0000, 0xFB41,0x9F9C,0x0000, 0xFB41,0x9F9C,0x0000, @@ -5700,7 +5699,7 @@ uint16 page0F9data[]= { /* F900 (3 weights per char) */ 0xFB41,0x8B58,0x0000, 0xFB40,0xCEC0,0x0000, 0xFB41,0x8336,0x0000, 0xFB40,0xD23A,0x0000 }; -uint16 page0FAdata[]= { /* FA00 (3 weights per char) */ +static const uint16 page0FAdata[]= { /* FA00 (3 weights per char) */ 0xFB40,0xD207,0x0000, 0xFB40,0xDEA6,0x0000, 0xFB40,0xE2D3,0x0000, 0xFB40,0xFCD6,0x0000, 0xFB40,0xDB85,0x0000, 0xFB40,0xED1E,0x0000, 0xFB40,0xE6B4,0x0000, 0xFB41,0x8F3B,0x0000, 0xFB41,0x884C,0x0000, @@ -5788,7 +5787,7 @@ uint16 page0FAdata[]= { /* FA00 (3 weights per char) */ 0xFBC1,0xFAFC,0x0000, 0xFBC1,0xFAFD,0x0000, 0xFBC1,0xFAFE,0x0000, 0xFBC1,0xFAFF,0x0000 }; -uint16 page0FBdata[]= { /* FB00 (4 weights per char) */ +static const uint16 page0FBdata[]= { /* FB00 (4 weights per char) */ 0x0EB9,0x0EB9,0x0000,0x0000, 0x0EB9,0x0EFB,0x0000,0x0000, 0x0EB9,0x0F2E,0x0000,0x0000, 0x0EB9,0x0EB9,0x0EFB,0x0000, 0x0EB9,0x0EB9,0x0F2E,0x0000, 0x0FEA,0x1002,0x0000,0x0000, @@ -5919,7 +5918,7 @@ uint16 page0FBdata[]= { /* FB00 (4 weights per char) */ 0x13C9,0x0000,0x0000,0x0000, 0x13C9,0x0000,0x0000,0x0000 }; -uint16 page0FCdata[]= { /* FC00 (3 weights per char) */ +static const uint16 page0FCdata[]= { /* FC00 (3 weights per char) */ 0x134F,0x135E,0x0000, 0x134F,0x1364,0x0000, 0x134F,0x13B0,0x0000, 0x134F,0x13C7,0x0000, 0x134F,0x13C8,0x0000, 0x1352,0x135E,0x0000, 0x1352,0x1364,0x0000, 0x1352,0x1365,0x0000, 0x1352,0x13B0,0x0000, @@ -6007,7 +6006,7 @@ uint16 page0FCdata[]= { /* FC00 (3 weights per char) */ 0x1381,0x13C8,0x0000, 0x1382,0x13C7,0x0000, 0x1382,0x13C8,0x0000, 0x1364,0x13C7,0x0000 }; -uint16 page0FDdata[]= { /* FD00 (9 weights per char) */ +static const uint16 page0FDdata[]= { /* FD00 (9 weights per char) */ 0x1364,0x13C8,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x135E,0x13C7,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x135E,0x13C8,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -6266,7 +6265,7 @@ uint16 page0FDdata[]= { /* FD00 (9 weights per char) */ 0xFBC1,0xFDFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 }; -uint16 page0FEdata[]= { /* FE00 (3 weights per char) */ +static const uint16 page0FEdata[]= { /* FE00 (3 weights per char) */ 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000, @@ -6354,7 +6353,7 @@ uint16 page0FEdata[]= { /* FE00 (3 weights per char) */ 0x13AB,0x1350,0x0000, 0xFBC1,0xFEFD,0x0000, 0xFBC1,0xFEFE,0x0000, 0x0000,0x0000,0x0000 }; -uint16 page0FFdata[]= { /* FF00 (3 weights per char) */ +static const uint16 page0FFdata[]= { /* FF00 (3 weights per char) */ 0xFBC1,0xFF00,0x0000, 0x0251,0x0000,0x0000, 0x027E,0x0000,0x0000, 0x02D2,0x0000,0x0000, 0x0E0F,0x0000,0x0000, 0x02D3,0x0000,0x0000, 0x02CF,0x0000,0x0000, 0x0277,0x0000,0x0000, 0x0288,0x0000,0x0000, @@ -6442,7 +6441,7 @@ uint16 page0FFdata[]= { /* FF00 (3 weights per char) */ 0x0DC5,0x0000,0x0000, 0x0DC6,0x0000,0x0000, 0xFBC1,0xFFFE,0x0000, 0xFBC1,0xFFFF,0x0000 }; -uchar uca_length[256]={ +static const uchar uca_length[256]={ 4,3,3,4,3,3,3,3,0,3,3,3,3,3,3,3, 3,3,3,3,3,2,3,3,3,3,0,0,0,3,3,3, 5,5,4,3,5,2,3,3,2,2,5,3,0,0,3,3, @@ -6460,7 +6459,8 @@ uchar uca_length[256]={ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,3,3,4,3,9,3,3 }; -uint16 *uca_weight[256]={ + +static const uint16 *const uca_weight[256]={ page000data,page001data,page002data,page003data, page004data,page005data,page006data,page007data, NULL ,page009data,page00Adata,page00Bdata, @@ -6740,9 +6740,9 @@ typedef struct my_uca_scanner_st const uint16 *wbeg; /* Beginning of the current weight string */ const uchar *sbeg; /* Beginning of the input string */ const uchar *send; /* End of the input string */ - uchar *uca_length; - uint16 **uca_weight; - MY_CONTRACTIONS *contractions; + const uchar *uca_length; + const uint16 * const *uca_weight; + const MY_CONTRACTIONS *contractions; uint16 implicit[2]; int page; int code; @@ -6760,7 +6760,7 @@ typedef struct my_uca_scanner_handler_st int (*next)(my_uca_scanner *scanner); } my_uca_scanner_handler; -static uint16 nochar[]= {0,0}; +static const uint16 nochar[]= {0,0}; /********** Helper functions to handle contraction ************/ @@ -6792,10 +6792,10 @@ my_uca_add_contraction_flag(CHARSET_INFO *cs, my_wc_t wc, int flag) */ static MY_CONTRACTION * -my_uca_add_contraction(CHARSET_INFO *cs, +my_uca_add_contraction(struct charset_info_st *cs, my_wc_t *wc, int len __attribute__((unused))) { - MY_CONTRACTIONS *list= cs->contractions; + MY_CONTRACTIONS *list= (MY_CONTRACTIONS*) cs->contractions; MY_CONTRACTION *next= &list->item[list->nitems]; DBUG_ASSERT(len == 2); /* We currently support only contraction2 */ next->ch[0]= wc[0]; @@ -6818,20 +6818,24 @@ my_uca_add_contraction(CHARSET_INFO *cs, */ static my_bool -my_uca_alloc_contractions(CHARSET_INFO *cs, void *(*alloc)(size_t), size_t n) +my_uca_alloc_contractions(struct charset_info_st *cs, + void *(*alloc)(size_t), size_t n) { uint size= n * sizeof(MY_CONTRACTION); - if (!(cs->contractions= (*alloc)(sizeof(MY_CONTRACTIONS)))) + MY_CONTRACTIONS *contractions; + + if (!(cs->contractions= contractions= (*alloc)(sizeof(MY_CONTRACTIONS)))) return 1; - bzero(cs->contractions, sizeof(MY_CONTRACTIONS)); - if (!(cs->contractions->item= (*alloc)(size)) || - !(cs->contractions->flags= (char*) (*alloc)(MY_UCA_CNT_FLAG_SIZE))) + bzero(contractions, sizeof(MY_CONTRACTIONS)); + if (!(contractions->item= (*alloc)(size)) || + !(contractions->flags= (char*) (*alloc)(MY_UCA_CNT_FLAG_SIZE))) return 1; - bzero((void*) cs->contractions->item, size); - bzero((void*) cs->contractions->flags, MY_UCA_CNT_FLAG_SIZE); + bzero(contractions->item, size); + bzero(contractions->flags, MY_UCA_CNT_FLAG_SIZE); return 0; } + #ifdef HAVE_CHARSET_ucs2 /* Initialize collation weight scanner @@ -6939,8 +6943,8 @@ static int my_uca_scanner_next_ucs2(my_uca_scanner *scanner) do { - uint16 **ucaw= scanner->uca_weight; - uchar *ucal= scanner->uca_length; + const uint16 *const *ucaw= scanner->uca_weight; + const uchar *ucal= scanner->uca_length; if (scanner->sbeg > scanner->send) return -1; @@ -6955,7 +6959,7 @@ static int my_uca_scanner_next_ucs2(my_uca_scanner *scanner) if (my_uca_can_be_contraction_head(scanner->cs, wc1)) { - uint16 *cweight; + const uint16 *cweight; my_wc_t wc2= (((my_wc_t) scanner->sbeg[0]) << 8) | scanner->sbeg[1]; if (my_uca_can_be_contraction_tail(scanner->cs, wc2) && (cweight= my_uca_contraction2_weight(scanner->cs, @@ -7036,8 +7040,8 @@ static int my_uca_scanner_next_any(my_uca_scanner *scanner) do { - uint16 **ucaw= scanner->uca_weight; - uchar *ucal= scanner->uca_length; + const uint16 *const *ucaw= scanner->uca_weight; + const uchar *ucal= scanner->uca_length; my_wc_t wc; int mb_len; @@ -7054,7 +7058,7 @@ static int my_uca_scanner_next_any(my_uca_scanner *scanner) my_uca_can_be_contraction_head(scanner->cs, wc)) { my_wc_t wc2; - uint16 *cweight; + const uint16 *cweight; if (((mb_len= scanner->cs->cset->mb_wc(scanner->cs, &wc2, scanner->sbeg, @@ -7117,14 +7121,14 @@ static my_uca_scanner_handler my_any_uca_scanner_handler= or NULL if this page does not have implicit weights. */ -static inline uint16 * +static inline const uint16 * my_char_weight_addr(CHARSET_INFO *cs, uint wc) { uint page= (wc >> 8); uint ofst= wc & 0xFF; - return cs->sort_order_big[page] ? - cs->sort_order_big[page] + ofst * cs->sort_order[page] : - NULL; + return (cs->sort_order_big[page] ? + cs->sort_order_big[page] + ofst * cs->sort_order[page] : + 0); } @@ -7414,12 +7418,12 @@ static int my_uca_charcmp(CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2) { size_t page1= wc1 >> MY_UCA_PSHIFT; size_t page2= wc2 >> MY_UCA_PSHIFT; - uchar *ucal= cs->sort_order; - uint16 **ucaw= cs->sort_order_big; + const uchar *ucal= cs->sort_order; + const uint16 *const *ucaw= cs->sort_order_big; size_t length1= ucal[page1]; size_t length2= ucal[page2]; - uint16 *weight1= ucaw[page1] + (wc1 & MY_UCA_CMASK) * ucal[page1]; - uint16 *weight2= ucaw[page2] + (wc2 & MY_UCA_CMASK) * ucal[page2]; + const uint16 *weight1= ucaw[page1] + (wc1 & MY_UCA_CMASK) * ucal[page1]; + const uint16 *weight2= ucaw[page2] + (wc2 & MY_UCA_CMASK) * ucal[page2]; if (!weight1 || !weight2) return wc1 != wc2; @@ -7451,9 +7455,7 @@ int my_wildcmp_uca(CHARSET_INFO *cs, int result= -1; /* Not found, using wildcards */ my_wc_t s_wc, w_wc; int scan; - int (*mb_wc)(struct charset_info_st *, my_wc_t *, - const uchar *, const uchar *); - mb_wc= cs->cset->mb_wc; + my_charset_conv_mb_wc mb_wc= cs->cset->mb_wc; while (wildstr != wildend) { @@ -7948,7 +7950,8 @@ static int my_coll_rule_parse(MY_COLL_RULE *rule, size_t mitems, default weights. */ -static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(size_t)) +static my_bool create_tailoring(struct charset_info_st *cs, + void *(*alloc)(size_t)) { MY_COLL_RULE rule[MY_MAX_COLL_RULE]; MY_COLL_RULE *r, *rfirst, *rlast; @@ -7956,7 +7959,7 @@ static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(size_t)) uchar *newlengths; uint16 **newweights; const uchar *deflengths= uca_length; - uint16 **defweights= uca_weight; + const uint16 *const *defweights= uca_weight; int rc, i; int ncontractions= 0; @@ -8052,11 +8055,11 @@ static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(size_t)) for (i= 0; i < 256 ; i++) { if (!newweights[i]) - newweights[i]= defweights[i]; + ((const uint16**) newweights)[i]= defweights[i]; } cs->sort_order= newlengths; - cs->sort_order_big= newweights; + cs->sort_order_big= (const uint16**) newweights; cs->contractions= NULL; /* Now process contractions */ @@ -8090,7 +8093,8 @@ static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(size_t)) Should work for any character set. */ -static my_bool my_coll_init_uca(CHARSET_INFO *cs, void *(*alloc)(size_t)) +static my_bool my_coll_init_uca(struct charset_info_st *cs, + void *(*alloc)(size_t)) { cs->pad_char= ' '; cs->ctype= my_charset_utf8_unicode_ci.ctype; @@ -8185,7 +8189,7 @@ MY_COLLATION_HANDLER my_collation_ucs2_uca_handler = my_propagate_complex }; -CHARSET_INFO my_charset_ucs2_unicode_ci= +struct charset_info_st my_charset_ucs2_unicode_ci= { 128,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8217,7 +8221,7 @@ CHARSET_INFO my_charset_ucs2_unicode_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_icelandic_uca_ci= +struct charset_info_st my_charset_ucs2_icelandic_uca_ci= { 129,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8249,7 +8253,7 @@ CHARSET_INFO my_charset_ucs2_icelandic_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_latvian_uca_ci= +struct charset_info_st my_charset_ucs2_latvian_uca_ci= { 130,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8281,7 +8285,7 @@ CHARSET_INFO my_charset_ucs2_latvian_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_romanian_uca_ci= +struct charset_info_st my_charset_ucs2_romanian_uca_ci= { 131,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8313,7 +8317,7 @@ CHARSET_INFO my_charset_ucs2_romanian_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_slovenian_uca_ci= +struct charset_info_st my_charset_ucs2_slovenian_uca_ci= { 132,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8345,7 +8349,7 @@ CHARSET_INFO my_charset_ucs2_slovenian_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_polish_uca_ci= +struct charset_info_st my_charset_ucs2_polish_uca_ci= { 133,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8377,7 +8381,7 @@ CHARSET_INFO my_charset_ucs2_polish_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_estonian_uca_ci= +struct charset_info_st my_charset_ucs2_estonian_uca_ci= { 134,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8409,7 +8413,7 @@ CHARSET_INFO my_charset_ucs2_estonian_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_spanish_uca_ci= +struct charset_info_st my_charset_ucs2_spanish_uca_ci= { 135,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8441,7 +8445,7 @@ CHARSET_INFO my_charset_ucs2_spanish_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_swedish_uca_ci= +struct charset_info_st my_charset_ucs2_swedish_uca_ci= { 136,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8473,7 +8477,7 @@ CHARSET_INFO my_charset_ucs2_swedish_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_turkish_uca_ci= +struct charset_info_st my_charset_ucs2_turkish_uca_ci= { 137,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8505,7 +8509,7 @@ CHARSET_INFO my_charset_ucs2_turkish_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_czech_uca_ci= +struct charset_info_st my_charset_ucs2_czech_uca_ci= { 138,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8538,7 +8542,7 @@ CHARSET_INFO my_charset_ucs2_czech_uca_ci= }; -CHARSET_INFO my_charset_ucs2_danish_uca_ci= +struct charset_info_st my_charset_ucs2_danish_uca_ci= { 139,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8570,7 +8574,7 @@ CHARSET_INFO my_charset_ucs2_danish_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_lithuanian_uca_ci= +struct charset_info_st my_charset_ucs2_lithuanian_uca_ci= { 140,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8602,7 +8606,7 @@ CHARSET_INFO my_charset_ucs2_lithuanian_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_slovak_uca_ci= +struct charset_info_st my_charset_ucs2_slovak_uca_ci= { 141,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8634,7 +8638,7 @@ CHARSET_INFO my_charset_ucs2_slovak_uca_ci= &my_collation_ucs2_uca_handler }; -CHARSET_INFO my_charset_ucs2_spanish2_uca_ci= +struct charset_info_st my_charset_ucs2_spanish2_uca_ci= { 142,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8667,7 +8671,7 @@ CHARSET_INFO my_charset_ucs2_spanish2_uca_ci= }; -CHARSET_INFO my_charset_ucs2_roman_uca_ci= +struct charset_info_st my_charset_ucs2_roman_uca_ci= { 143,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8700,7 +8704,7 @@ CHARSET_INFO my_charset_ucs2_roman_uca_ci= }; -CHARSET_INFO my_charset_ucs2_persian_uca_ci= +struct charset_info_st my_charset_ucs2_persian_uca_ci= { 144,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8733,7 +8737,7 @@ CHARSET_INFO my_charset_ucs2_persian_uca_ci= }; -CHARSET_INFO my_charset_ucs2_esperanto_uca_ci= +struct charset_info_st my_charset_ucs2_esperanto_uca_ci= { 145,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8766,7 +8770,7 @@ CHARSET_INFO my_charset_ucs2_esperanto_uca_ci= }; -CHARSET_INFO my_charset_ucs2_hungarian_uca_ci= +struct charset_info_st my_charset_ucs2_hungarian_uca_ci= { 146,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -8799,7 +8803,7 @@ CHARSET_INFO my_charset_ucs2_hungarian_uca_ci= }; -CHARSET_INFO my_charset_ucs2_croatian_uca_ci= +struct charset_info_st my_charset_ucs2_croatian_uca_ci= { 149,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -8879,7 +8883,7 @@ static uchar ctype_utf8[] = { extern MY_CHARSET_HANDLER my_charset_utf8_handler; -CHARSET_INFO my_charset_utf8_unicode_ci= +struct charset_info_st my_charset_utf8_unicode_ci= { 192,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -8912,7 +8916,7 @@ CHARSET_INFO my_charset_utf8_unicode_ci= }; -CHARSET_INFO my_charset_utf8_icelandic_uca_ci= +struct charset_info_st my_charset_utf8_icelandic_uca_ci= { 193,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -8944,7 +8948,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_latvian_uca_ci= +struct charset_info_st my_charset_utf8_latvian_uca_ci= { 194,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -8976,7 +8980,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_romanian_uca_ci= +struct charset_info_st my_charset_utf8_romanian_uca_ci= { 195,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9008,7 +9012,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_slovenian_uca_ci= +struct charset_info_st my_charset_utf8_slovenian_uca_ci= { 196,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9040,7 +9044,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_polish_uca_ci= +struct charset_info_st my_charset_utf8_polish_uca_ci= { 197,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9072,7 +9076,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_estonian_uca_ci= +struct charset_info_st my_charset_utf8_estonian_uca_ci= { 198,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9104,7 +9108,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_spanish_uca_ci= +struct charset_info_st my_charset_utf8_spanish_uca_ci= { 199,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9136,7 +9140,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_swedish_uca_ci= +struct charset_info_st my_charset_utf8_swedish_uca_ci= { 200,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9168,7 +9172,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_turkish_uca_ci= +struct charset_info_st my_charset_utf8_turkish_uca_ci= { 201,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9200,7 +9204,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_czech_uca_ci= +struct charset_info_st my_charset_utf8_czech_uca_ci= { 202,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9233,7 +9237,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci= }; -CHARSET_INFO my_charset_utf8_danish_uca_ci= +struct charset_info_st my_charset_utf8_danish_uca_ci= { 203,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9265,7 +9269,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_lithuanian_uca_ci= +struct charset_info_st my_charset_utf8_lithuanian_uca_ci= { 204,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9297,7 +9301,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_slovak_uca_ci= +struct charset_info_st my_charset_utf8_slovak_uca_ci= { 205,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9329,7 +9333,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_spanish2_uca_ci= +struct charset_info_st my_charset_utf8_spanish2_uca_ci= { 206,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9361,7 +9365,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_roman_uca_ci= +struct charset_info_st my_charset_utf8_roman_uca_ci= { 207,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9393,7 +9397,7 @@ CHARSET_INFO my_charset_utf8_roman_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_persian_uca_ci= +struct charset_info_st my_charset_utf8_persian_uca_ci= { 208,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9425,7 +9429,7 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_esperanto_uca_ci= +struct charset_info_st my_charset_utf8_esperanto_uca_ci= { 209,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9457,7 +9461,7 @@ CHARSET_INFO my_charset_utf8_esperanto_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_hungarian_uca_ci= +struct charset_info_st my_charset_utf8_hungarian_uca_ci= { 210,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9489,7 +9493,7 @@ CHARSET_INFO my_charset_utf8_hungarian_uca_ci= &my_collation_any_uca_handler }; -CHARSET_INFO my_charset_utf8_croatian_uca_ci= +struct charset_info_st my_charset_utf8_croatian_uca_ci= { 213,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, @@ -9584,11 +9588,11 @@ my_uca_can_be_contraction_tail(CHARSET_INFO *cs, my_wc_t wc) @retval ptr - contraction weight array */ -uint16 * +const uint16 * my_uca_contraction2_weight(CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2) { - MY_CONTRACTIONS *list= cs->contractions; - MY_CONTRACTION *c, *last; + const MY_CONTRACTIONS *list= cs->contractions; + const MY_CONTRACTION *c, *last; for (c= list->item, last= &list->item[list->nitems]; c < last; c++) { if (c->ch[0] == wc1 && c->ch[1] == wc2) diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 7ad25fb3565..80a9280055f 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -32,7 +32,7 @@ #endif -static uchar ctype_ucs2[] = { +static const uchar ctype_ucs2[] = { 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, @@ -52,7 +52,7 @@ static uchar ctype_ucs2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -static uchar to_lower_ucs2[] = { +static const uchar to_lower_ucs2[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -71,7 +71,7 @@ static uchar to_lower_ucs2[] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static uchar to_upper_ucs2[] = { +static const uchar to_upper_ucs2[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -120,7 +120,7 @@ static size_t my_caseup_ucs2(CHARSET_INFO *cs, char *src, size_t srclen, my_wc_t wc; int res; char *srcend= src + srclen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; DBUG_ASSERT(src == dst && srclen == dstlen); while ((src < srcend) && @@ -142,7 +142,7 @@ static void my_hash_sort_ucs2(CHARSET_INFO *cs, const uchar *s, size_t slen, my_wc_t wc; int res; const uchar *e=s+slen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while (e > s+1 && e[-1] == ' ' && e[-2] == '\0') e-= 2; @@ -174,7 +174,7 @@ static size_t my_casedn_ucs2(CHARSET_INFO *cs, char *src, size_t srclen, my_wc_t wc; int res; char *srcend= src + srclen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; DBUG_ASSERT(src == dst && srclen == dstlen); while ((src < srcend) && @@ -206,7 +206,7 @@ static int my_strnncoll_ucs2(CHARSET_INFO *cs, my_wc_t UNINIT_VAR(s_wc),t_wc; const uchar *se=s+slen; const uchar *te=t+tlen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while ( s < se && t < te ) { @@ -270,7 +270,7 @@ static int my_strnncollsp_ucs2(CHARSET_INFO *cs __attribute__((unused)), { const uchar *se, *te; size_t minlen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; /* extra safety to make sure the lengths are even numbers */ slen&= ~1; @@ -320,7 +320,7 @@ static int my_strncasecmp_ucs2(CHARSET_INFO *cs, my_wc_t UNINIT_VAR(s_wc),t_wc; const char *se=s+len; const char *te=t+len; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while ( s < se && t < te ) { @@ -369,7 +369,7 @@ static size_t my_strnxfrm_ucs2(CHARSET_INFO *cs, int plane; uchar *de = dst + dstlen; const uchar *se = src + srclen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while( src < se && dst < de ) { @@ -1360,7 +1360,7 @@ int my_wildcmp_ucs2_ci(CHARSET_INFO *cs, const char *wildstr,const char *wildend, int escape, int w_one, int w_many) { - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; return my_wildcmp_unicode(cs,str,str_end,wildstr,wildend, escape,w_one,w_many,uni_plane); } @@ -1718,7 +1718,7 @@ MY_CHARSET_HANDLER my_charset_ucs2_handler= }; -CHARSET_INFO my_charset_ucs2_general_ci= +struct charset_info_st my_charset_ucs2_general_ci= { 35,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, @@ -1750,7 +1750,7 @@ CHARSET_INFO my_charset_ucs2_general_ci= &my_collation_ucs2_general_ci_handler }; -CHARSET_INFO my_charset_ucs2_bin= +struct charset_info_st my_charset_ucs2_bin= { 90,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NONASCII, diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index 1a872a92595..3adee2cff07 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -32,7 +32,7 @@ #ifdef HAVE_CHARSET_ujis -static uchar NEAR ctype_ujis[257] = +static const uchar NEAR ctype_ujis[257] = { 0, /* For standard library */ 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */ @@ -69,7 +69,7 @@ static uchar NEAR ctype_ujis[257] = 0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000, }; -static uchar NEAR to_lower_ujis[]= +static const uchar NEAR to_lower_ujis[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -105,7 +105,7 @@ static uchar NEAR to_lower_ujis[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR to_upper_ujis[]= +static const uchar NEAR to_upper_ujis[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -141,7 +141,7 @@ static uchar NEAR to_upper_ujis[]= (uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377' }; -static uchar NEAR sort_order_ujis[]= +static const uchar NEAR sort_order_ujis[]= { '\000','\001','\002','\003','\004','\005','\006','\007', '\010','\011','\012','\013','\014','\015','\016','\017', @@ -200,7 +200,7 @@ static uint mbcharlen_ujis(CHARSET_INFO *cs __attribute__((unused)),uint c) } -static uint16 tab_jisx0201_uni[256]={ +static const uint16 tab_jisx0201_uni[256]={ 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -269,7 +269,7 @@ my_wc_mb_jisx0201(CHARSET_INFO *cs __attribute__((unused)), /* page 0 0x2121-0x217E */ -static uint16 tab_jisx0208_uni0[]={ +static const uint16 tab_jisx0208_uni0[]={ 0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B, 0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E, 0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD, @@ -284,7 +284,7 @@ static uint16 tab_jisx0208_uni0[]={ 0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7}; /* page 1 0x2221-0x227E */ -static uint16 tab_jisx0208_uni1[]={ +static const uint16 tab_jisx0208_uni1[]={ 0x25C6,0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x203B, 0x3012,0x2192,0x2190,0x2191,0x2193,0x3013, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -299,7 +299,7 @@ static uint16 tab_jisx0208_uni1[]={ 0x00B6, 0, 0, 0, 0,0x25EF}; /* page 2 0x2330-0x237A */ -static uint16 tab_jisx0208_uni2[]={ +static const uint16 tab_jisx0208_uni2[]={ 0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17, 0xFF18,0xFF19, 0, 0, 0, 0, 0, 0, 0,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27, @@ -312,7 +312,7 @@ static uint16 tab_jisx0208_uni2[]={ 0xFF58,0xFF59,0xFF5A}; /* page 3 0x2421-0x2473 */ -static uint16 tab_jisx0208_uni3[]={ +static const uint16 tab_jisx0208_uni3[]={ 0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048, 0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050, 0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058, @@ -326,7 +326,7 @@ static uint16 tab_jisx0208_uni3[]={ 0x3091,0x3092,0x3093}; /* page 4 0x2521-0x2576 */ -static uint16 tab_jisx0208_uni4[]={ +static const uint16 tab_jisx0208_uni4[]={ 0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8, 0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0, 0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8, @@ -340,7 +340,7 @@ static uint16 tab_jisx0208_uni4[]={ 0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6}; /* page 5 0x2621-0x2658 */ -static uint16 tab_jisx0208_uni5[]={ +static const uint16 tab_jisx0208_uni5[]={ 0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398, 0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0, 0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9, @@ -351,7 +351,7 @@ static uint16 tab_jisx0208_uni5[]={ }; /* page 6 0x2721-0x2771 */ -static uint16 tab_jisx0208_uni6[]={ +static const uint16 tab_jisx0208_uni6[]={ 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416, 0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E, 0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426, @@ -365,7 +365,7 @@ static uint16 tab_jisx0208_uni6[]={ 0x044F}; /* page 7 0x2821-0x2840 */ -static uint16 tab_jisx0208_uni7[]={ +static const uint16 tab_jisx0208_uni7[]={ 0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,0x252C, 0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,0x251B, 0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,0x252F, @@ -373,7 +373,7 @@ static uint16 tab_jisx0208_uni7[]={ }; /* page 8 0x3021-0x307E */ -static uint16 tab_jisx0208_uni8[]={ +static const uint16 tab_jisx0208_uni8[]={ 0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6, 0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED, 0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B, @@ -388,7 +388,7 @@ static uint16 tab_jisx0208_uni8[]={ 0x59FB,0x5F15,0x98F2,0x6DEB,0x80E4,0x852D}; /* page 9 0x3121-0x317E */ -static uint16 tab_jisx0208_uni9[]={ +static const uint16 tab_jisx0208_uni9[]={ 0x9662,0x9670,0x96A0,0x97FB,0x540B,0x53F3,0x5B87,0x70CF, 0x7FBD,0x8FC2,0x96E8,0x536F,0x9D5C,0x7ABA,0x4E11,0x7893, 0x81FC,0x6E26,0x5618,0x5504,0x6B1D,0x851A,0x9C3B,0x59E5, @@ -403,7 +403,7 @@ static uint16 tab_jisx0208_uni9[]={ 0x7525,0x51F9,0x592E,0x5965,0x5F80,0x5FDC}; /* page 10 0x3221-0x327E */ -static uint16 tab_jisx0208_uni10[]={ +static const uint16 tab_jisx0208_uni10[]={ 0x62BC,0x65FA,0x6A2A,0x6B27,0x6BB4,0x738B,0x7FC1,0x8956, 0x9D2C,0x9D0E,0x9EC4,0x5CA1,0x6C96,0x837B,0x5104,0x5C4B, 0x61B6,0x81C6,0x6876,0x7261,0x4E59,0x4FFA,0x5378,0x6069, @@ -418,7 +418,7 @@ static uint16 tab_jisx0208_uni10[]={ 0x6094,0x6062,0x61D0,0x6212,0x62D0,0x6539}; /* page 11 0x3321-0x337E */ -static uint16 tab_jisx0208_uni11[]={ +static const uint16 tab_jisx0208_uni11[]={ 0x9B41,0x6666,0x68B0,0x6D77,0x7070,0x754C,0x7686,0x7D75, 0x82A5,0x87F9,0x958B,0x968E,0x8C9D,0x51F1,0x52BE,0x5916, 0x54B3,0x5BB3,0x5D16,0x6168,0x6982,0x6DAF,0x788D,0x84CB, @@ -433,7 +433,7 @@ static uint16 tab_jisx0208_uni11[]={ 0x938C,0x565B,0x9D28,0x6822,0x8305,0x8431}; /* page 12 0x3421-0x347E */ -static uint16 tab_jisx0208_uni12[]={ +static const uint16 tab_jisx0208_uni12[]={ 0x7CA5,0x5208,0x82C5,0x74E6,0x4E7E,0x4F83,0x51A0,0x5BD2, 0x520A,0x52D8,0x52E7,0x5DFB,0x559A,0x582A,0x59E6,0x5B8C, 0x5B98,0x5BDB,0x5E72,0x5E79,0x60A3,0x611F,0x6163,0x61BE, @@ -448,7 +448,7 @@ static uint16 tab_jisx0208_uni12[]={ 0x673A,0x65D7,0x65E2,0x671F,0x68CB,0x68C4}; /* page 13 0x3521-0x357E */ -static uint16 tab_jisx0208_uni13[]={ +static const uint16 tab_jisx0208_uni13[]={ 0x6A5F,0x5E30,0x6BC5,0x6C17,0x6C7D,0x757F,0x7948,0x5B63, 0x7A00,0x7D00,0x5FBD,0x898F,0x8A18,0x8CB4,0x8D77,0x8ECC, 0x8F1D,0x98E2,0x9A0E,0x9B3C,0x4E80,0x507D,0x5100,0x5993, @@ -463,7 +463,7 @@ static uint16 tab_jisx0208_uni13[]={ 0x6F01,0x79A6,0x9B5A,0x4EA8,0x4EAB,0x4EAC}; /* page 14 0x3621-0x367E */ -static uint16 tab_jisx0208_uni14[]={ +static const uint16 tab_jisx0208_uni14[]={ 0x4F9B,0x4FA0,0x50D1,0x5147,0x7AF6,0x5171,0x51F6,0x5354, 0x5321,0x537F,0x53EB,0x55AC,0x5883,0x5CE1,0x5F37,0x5F4A, 0x602F,0x6050,0x606D,0x631F,0x6559,0x6A4B,0x6CC1,0x72C2, @@ -478,7 +478,7 @@ static uint16 tab_jisx0208_uni14[]={ 0x9685,0x4E32,0x6ADB,0x91E7,0x5C51,0x5C48}; /* page 15 0x3721-0x377E */ -static uint16 tab_jisx0208_uni15[]={ +static const uint16 tab_jisx0208_uni15[]={ 0x6398,0x7A9F,0x6C93,0x9774,0x8F61,0x7AAA,0x718A,0x9688, 0x7C82,0x6817,0x7E70,0x6851,0x936C,0x52F2,0x541B,0x85AB, 0x8A13,0x7FA4,0x8ECD,0x90E1,0x5366,0x8888,0x7941,0x4FC2, @@ -493,7 +493,7 @@ static uint16 tab_jisx0208_uni15[]={ 0x5ACC,0x5EFA,0x61B2,0x61F8,0x62F3,0x6372}; /* page 16 0x3821-0x387E */ -static uint16 tab_jisx0208_uni16[]={ +static const uint16 tab_jisx0208_uni16[]={ 0x691C,0x6A29,0x727D,0x72AC,0x732E,0x7814,0x786F,0x7D79, 0x770C,0x80A9,0x898B,0x8B19,0x8CE2,0x8ED2,0x9063,0x9375, 0x967A,0x9855,0x9A13,0x9E78,0x5143,0x539F,0x53B3,0x5E7B, @@ -508,7 +508,7 @@ static uint16 tab_jisx0208_uni16[]={ 0x529F,0x52B9,0x52FE,0x539A,0x53E3,0x5411}; /* page 17 0x3921-0x397E */ -static uint16 tab_jisx0208_uni17[]={ +static const uint16 tab_jisx0208_uni17[]={ 0x540E,0x5589,0x5751,0x57A2,0x597D,0x5B54,0x5B5D,0x5B8F, 0x5DE5,0x5DE7,0x5DF7,0x5E78,0x5E83,0x5E9A,0x5EB7,0x5F18, 0x6052,0x614C,0x6297,0x62D8,0x63A7,0x653B,0x6602,0x6643, @@ -523,7 +523,7 @@ static uint16 tab_jisx0208_uni17[]={ 0x7511,0x5FFD,0x60DA,0x9AA8,0x72DB,0x8FBC}; /* page 18 0x3A21-0x3A7E */ -static uint16 tab_jisx0208_uni18[]={ +static const uint16 tab_jisx0208_uni18[]={ 0x6B64,0x9803,0x4ECA,0x56F0,0x5764,0x58BE,0x5A5A,0x6068, 0x61C7,0x660F,0x6606,0x6839,0x68B1,0x6DF7,0x75D5,0x7D3A, 0x826E,0x9B42,0x4E9B,0x4F50,0x53C9,0x5506,0x5D6F,0x5DE6, @@ -538,7 +538,7 @@ static uint16 tab_jisx0208_uni18[]={ 0x685C,0x9BAD,0x7B39,0x5319,0x518A,0x5237}; /* page 19 0x3B21-0x3B7E */ -static uint16 tab_jisx0208_uni19[]={ +static const uint16 tab_jisx0208_uni19[]={ 0x5BDF,0x62F6,0x64AE,0x64E6,0x672D,0x6BBA,0x85A9,0x96D1, 0x7690,0x9BD6,0x634C,0x9306,0x9BAB,0x76BF,0x6652,0x4E09, 0x5098,0x53C2,0x5C71,0x60E8,0x6492,0x6563,0x685F,0x71E6, @@ -553,7 +553,7 @@ static uint16 tab_jisx0208_uni19[]={ 0x5150,0x5B57,0x5BFA,0x6148,0x6301,0x6642}; /* page 20 0x3C21-0x3C7E */ -static uint16 tab_jisx0208_uni20[]={ +static const uint16 tab_jisx0208_uni20[]={ 0x6B21,0x6ECB,0x6CBB,0x723E,0x74BD,0x75D4,0x78C1,0x793A, 0x800C,0x8033,0x81EA,0x8494,0x8F9E,0x6C50,0x9E7F,0x5F0F, 0x8B58,0x9D2B,0x7AFA,0x8EF8,0x5B8D,0x96EB,0x4E03,0x53F1, @@ -568,7 +568,7 @@ static uint16 tab_jisx0208_uni20[]={ 0x6A39,0x7DAC,0x9700,0x56DA,0x53CE,0x5468}; /* page 21 0x3D21-0x3D7E */ -static uint16 tab_jisx0208_uni21[]={ +static const uint16 tab_jisx0208_uni21[]={ 0x5B97,0x5C31,0x5DDE,0x4FEE,0x6101,0x62FE,0x6D32,0x79C0, 0x79CB,0x7D42,0x7E4D,0x7FD2,0x81ED,0x821F,0x8490,0x8846, 0x8972,0x8B90,0x8E74,0x8F2F,0x9031,0x914B,0x916C,0x96C6, @@ -583,7 +583,7 @@ static uint16 tab_jisx0208_uni21[]={ 0x5F90,0x6055,0x92E4,0x9664,0x50B7,0x511F}; /* page 22 0x3E21-0x3E7E */ -static uint16 tab_jisx0208_uni22[]={ +static const uint16 tab_jisx0208_uni22[]={ 0x52DD,0x5320,0x5347,0x53EC,0x54E8,0x5546,0x5531,0x5617, 0x5968,0x59BE,0x5A3C,0x5BB5,0x5C06,0x5C0F,0x5C11,0x5C1A, 0x5E84,0x5E8A,0x5EE0,0x5F70,0x627F,0x6284,0x62DB,0x638C, @@ -598,7 +598,7 @@ static uint16 tab_jisx0208_uni22[]={ 0x8B72,0x91B8,0x9320,0x5631,0x57F4,0x98FE}; /* page 23 0x3F21-0x3F7E */ -static uint16 tab_jisx0208_uni23[]={ +static const uint16 tab_jisx0208_uni23[]={ 0x62ED,0x690D,0x6B96,0x71ED,0x7E54,0x8077,0x8272,0x89E6, 0x98DF,0x8755,0x8FB1,0x5C3B,0x4F38,0x4FE1,0x4FB5,0x5507, 0x5A20,0x5BDD,0x5BE9,0x5FC3,0x614E,0x632F,0x65B0,0x664B, @@ -613,7 +613,7 @@ static uint16 tab_jisx0208_uni23[]={ 0x6749,0x6919,0x83C5,0x9817,0x96C0,0x88FE}; /* page 24 0x4021-0x407E */ -static uint16 tab_jisx0208_uni24[]={ +static const uint16 tab_jisx0208_uni24[]={ 0x6F84,0x647A,0x5BF8,0x4E16,0x702C,0x755D,0x662F,0x51C4, 0x5236,0x52E2,0x59D3,0x5F81,0x6027,0x6210,0x653F,0x6574, 0x661F,0x6674,0x68F2,0x6816,0x6B63,0x6E05,0x7272,0x751F, @@ -628,7 +628,7 @@ static uint16 tab_jisx0208_uni24[]={ 0x714E,0x717D,0x65CB,0x7A7F,0x7BAD,0x7DDA}; /* page 25 0x4121-0x417E */ -static uint16 tab_jisx0208_uni25[]={ +static const uint16 tab_jisx0208_uni25[]={ 0x7E4A,0x7FA8,0x817A,0x821B,0x8239,0x85A6,0x8A6E,0x8CCE, 0x8DF5,0x9078,0x9077,0x92AD,0x9291,0x9583,0x9BAE,0x524D, 0x5584,0x6F38,0x7136,0x5168,0x7985,0x7E55,0x81B3,0x7CCE, @@ -643,7 +643,7 @@ static uint16 tab_jisx0208_uni25[]={ 0x9397,0x971C,0x9A12,0x50CF,0x5897,0x618E}; /* page 26 0x4221-0x427E */ -static uint16 tab_jisx0208_uni26[]={ +static const uint16 tab_jisx0208_uni26[]={ 0x81D3,0x8535,0x8D08,0x9020,0x4FC3,0x5074,0x5247,0x5373, 0x606F,0x6349,0x675F,0x6E2C,0x8DB3,0x901F,0x4FD7,0x5C5E, 0x8CCA,0x65CF,0x7D9A,0x5352,0x8896,0x5176,0x63C3,0x5B58, @@ -658,7 +658,7 @@ static uint16 tab_jisx0208_uni26[]={ 0x6FC1,0x8AFE,0x8338,0x51E7,0x86F8,0x53EA}; /* page 27 0x4321-0x437E */ -static uint16 tab_jisx0208_uni27[]={ +static const uint16 tab_jisx0208_uni27[]={ 0x53E9,0x4F46,0x9054,0x8FB0,0x596A,0x8131,0x5DFD,0x7AEA, 0x8FBF,0x68DA,0x8C37,0x72F8,0x9C48,0x6A3D,0x8AB0,0x4E39, 0x5358,0x5606,0x5766,0x62C5,0x63A2,0x65E6,0x6B4E,0x6DE1, @@ -673,7 +673,7 @@ static uint16 tab_jisx0208_uni27[]={ 0x8CAF,0x4E01,0x5146,0x51CB,0x558B,0x5BF5}; /* page 28 0x4421-0x447E */ -static uint16 tab_jisx0208_uni28[]={ +static const uint16 tab_jisx0208_uni28[]={ 0x5E16,0x5E33,0x5E81,0x5F14,0x5F35,0x5F6B,0x5FB4,0x61F2, 0x6311,0x66A2,0x671D,0x6F6E,0x7252,0x753A,0x773A,0x8074, 0x8139,0x8178,0x8776,0x8ABF,0x8ADC,0x8D85,0x8DF3,0x929A, @@ -688,7 +688,7 @@ static uint16 tab_jisx0208_uni28[]={ 0x7DE0,0x8247,0x8A02,0x8AE6,0x8E44,0x9013}; /* page 29 0x4521-0x457E */ -static uint16 tab_jisx0208_uni29[]={ +static const uint16 tab_jisx0208_uni29[]={ 0x90B8,0x912D,0x91D8,0x9F0E,0x6CE5,0x6458,0x64E2,0x6575, 0x6EF4,0x7684,0x7B1B,0x9069,0x93D1,0x6EBA,0x54F2,0x5FB9, 0x64A4,0x8F4D,0x8FED,0x9244,0x5178,0x586B,0x5929,0x5C55, @@ -703,7 +703,7 @@ static uint16 tab_jisx0208_uni29[]={ 0x7B49,0x7B54,0x7B52,0x7CD6,0x7D71,0x5230}; /* page 30 0x4621-0x467E */ -static uint16 tab_jisx0208_uni30[]={ +static const uint16 tab_jisx0208_uni30[]={ 0x8463,0x8569,0x85E4,0x8A0E,0x8B04,0x8C46,0x8E0F,0x9003, 0x900F,0x9419,0x9676,0x982D,0x9A30,0x95D8,0x50CD,0x52D5, 0x540C,0x5802,0x5C0E,0x61A7,0x649E,0x6D1E,0x77B3,0x7AE5, @@ -718,7 +718,7 @@ static uint16 tab_jisx0208_uni30[]={ 0x8089,0x8679,0x5EFF,0x65E5,0x4E73,0x5165}; /* page 31 0x4721-0x477E */ -static uint16 tab_jisx0208_uni31[]={ +static const uint16 tab_jisx0208_uni31[]={ 0x5982,0x5C3F,0x97EE,0x4EFB,0x598A,0x5FCD,0x8A8D,0x6FE1, 0x79B0,0x7962,0x5BE7,0x8471,0x732B,0x71B1,0x5E74,0x5FF5, 0x637B,0x649A,0x71C3,0x7C98,0x4E43,0x5EFC,0x4E4B,0x57DC, @@ -733,7 +733,7 @@ static uint16 tab_jisx0208_uni31[]={ 0x6F20,0x7206,0x7E1B,0x83AB,0x99C1,0x9EA6}; /* page 32 0x4821-0x487E */ -static uint16 tab_jisx0208_uni32[]={ +static const uint16 tab_jisx0208_uni32[]={ 0x51FD,0x7BB1,0x7872,0x7BB8,0x8087,0x7B48,0x6AE8,0x5E61, 0x808C,0x7551,0x7560,0x516B,0x9262,0x6E8C,0x767A,0x9197, 0x9AEA,0x4F10,0x7F70,0x629C,0x7B4F,0x95A5,0x9CE9,0x567A, @@ -748,7 +748,7 @@ static uint16 tab_jisx0208_uni32[]={ 0x5FAE,0x6787,0x6BD8,0x7435,0x7709,0x7F8E}; /* page 33 0x4921-0x497E */ -static uint16 tab_jisx0208_uni33[]={ +static const uint16 tab_jisx0208_uni33[]={ 0x9F3B,0x67CA,0x7A17,0x5339,0x758B,0x9AED,0x5F66,0x819D, 0x83F1,0x8098,0x5F3C,0x5FC5,0x7562,0x7B46,0x903C,0x6867, 0x59EB,0x5A9B,0x7D10,0x767E,0x8B2C,0x4FF5,0x5F6A,0x6A19, @@ -763,7 +763,7 @@ static uint16 tab_jisx0208_uni33[]={ 0x8557,0x4F0F,0x526F,0x5FA9,0x5E45,0x670D}; /* page 34 0x4A21-0x4A7E */ -static uint16 tab_jisx0208_uni34[]={ +static const uint16 tab_jisx0208_uni34[]={ 0x798F,0x8179,0x8907,0x8986,0x6DF5,0x5F17,0x6255,0x6CB8, 0x4ECF,0x7269,0x9B92,0x5206,0x543B,0x5674,0x58B3,0x61A4, 0x626E,0x711A,0x596E,0x7C89,0x7CDE,0x7D1B,0x96F0,0x6587, @@ -778,7 +778,7 @@ static uint16 tab_jisx0208_uni34[]={ 0x5E96,0x62B1,0x6367,0x653E,0x65B9,0x670B}; /* page 35 0x4B21-0x4B7E */ -static uint16 tab_jisx0208_uni35[]={ +static const uint16 tab_jisx0208_uni35[]={ 0x6CD5,0x6CE1,0x70F9,0x7832,0x7E2B,0x80DE,0x82B3,0x840C, 0x84EC,0x8702,0x8912,0x8A2A,0x8C4A,0x90A6,0x92D2,0x98FD, 0x9CF3,0x9D6C,0x4E4F,0x4EA1,0x508D,0x5256,0x574A,0x59A8, @@ -793,7 +793,7 @@ static uint16 tab_jisx0208_uni35[]={ 0x4FAD,0x7E6D,0x9EBF,0x4E07,0x6162,0x6E80}; /* page 36 0x4C21-0x4C7E */ -static uint16 tab_jisx0208_uni36[]={ +static const uint16 tab_jisx0208_uni36[]={ 0x6F2B,0x8513,0x5473,0x672A,0x9B45,0x5DF3,0x7B95,0x5CAC, 0x5BC6,0x871C,0x6E4A,0x84D1,0x7A14,0x8108,0x5999,0x7C8D, 0x6C11,0x7720,0x52D9,0x5922,0x7121,0x725F,0x77DB,0x9727, @@ -808,7 +808,7 @@ static uint16 tab_jisx0208_uni36[]={ 0x85AE,0x9453,0x6109,0x6108,0x6CB9,0x7652}; /* page 37 0x4D21-0x4D7E */ -static uint16 tab_jisx0208_uni37[]={ +static const uint16 tab_jisx0208_uni37[]={ 0x8AED,0x8F38,0x552F,0x4F51,0x512A,0x52C7,0x53CB,0x5BA5, 0x5E7D,0x60A0,0x6182,0x63D6,0x6709,0x67DA,0x6E67,0x6D8C, 0x7336,0x7337,0x7531,0x7950,0x88D5,0x8A98,0x904A,0x9091, @@ -823,7 +823,7 @@ static uint16 tab_jisx0208_uni37[]={ 0x540F,0x5C65,0x674E,0x68A8,0x7406,0x7483}; /* page 38 0x4E21-0x4E7E */ -static uint16 tab_jisx0208_uni38[]={ +static const uint16 tab_jisx0208_uni38[]={ 0x75E2,0x88CF,0x88E1,0x91CC,0x96E2,0x9678,0x5F8B,0x7387, 0x7ACB,0x844E,0x63A0,0x7565,0x5289,0x6D41,0x6E9C,0x7409, 0x7559,0x786B,0x7C92,0x9686,0x7ADC,0x9F8D,0x4FB6,0x616E, @@ -838,7 +838,7 @@ static uint16 tab_jisx0208_uni38[]={ 0x6190,0x6F23,0x7149,0x7C3E,0x7DF4,0x806F}; /* page 39 0x4F21-0x4F53 */ -static uint16 tab_jisx0208_uni39[]={ +static const uint16 tab_jisx0208_uni39[]={ 0x84EE,0x9023,0x932C,0x5442,0x9B6F,0x6AD3,0x7089,0x8CC2, 0x8DEF,0x9732,0x52B4,0x5A41,0x5ECA,0x5F04,0x6717,0x697C, 0x6994,0x6D6A,0x6F0F,0x7262,0x72FC,0x7BED,0x8001,0x807E, @@ -848,7 +848,7 @@ static uint16 tab_jisx0208_uni39[]={ 0x6E7E,0x7897,0x8155}; /* page 40 0x5021-0x507E */ -static uint16 tab_jisx0208_uni40[]={ +static const uint16 tab_jisx0208_uni40[]={ 0x5F0C,0x4E10,0x4E15,0x4E2A,0x4E31,0x4E36,0x4E3C,0x4E3F, 0x4E42,0x4E56,0x4E58,0x4E82,0x4E85,0x8C6B,0x4E8A,0x8212, 0x5F0D,0x4E8E,0x4E9E,0x4E9F,0x4EA0,0x4EA2,0x4EB0,0x4EB3, @@ -863,7 +863,7 @@ static uint16 tab_jisx0208_uni40[]={ 0x5078,0x5080,0x509A,0x5085,0x50B4,0x50B2}; /* page 41 0x5121-0x517E */ -static uint16 tab_jisx0208_uni41[]={ +static const uint16 tab_jisx0208_uni41[]={ 0x50C9,0x50CA,0x50B3,0x50C2,0x50D6,0x50DE,0x50E5,0x50ED, 0x50E3,0x50EE,0x50F9,0x50F5,0x5109,0x5101,0x5102,0x5116, 0x5115,0x5114,0x511A,0x5121,0x513A,0x5137,0x513C,0x513B, @@ -878,7 +878,7 @@ static uint16 tab_jisx0208_uni41[]={ 0x5294,0x5292,0x5271,0x5288,0x5291,0x8FA8}; /* page 42 0x5221-0x527E */ -static uint16 tab_jisx0208_uni42[]={ +static const uint16 tab_jisx0208_uni42[]={ 0x8FA7,0x52AC,0x52AD,0x52BC,0x52B5,0x52C1,0x52CD,0x52D7, 0x52DE,0x52E3,0x52E6,0x98ED,0x52E0,0x52F3,0x52F5,0x52F8, 0x52F9,0x5306,0x5308,0x7538,0x530D,0x5310,0x530F,0x5315, @@ -893,7 +893,7 @@ static uint16 tab_jisx0208_uni42[]={ 0x54B8,0x54A5,0x54AC,0x54C4,0x54C8,0x54A8}; /* page 43 0x5321-0x537E */ -static uint16 tab_jisx0208_uni43[]={ +static const uint16 tab_jisx0208_uni43[]={ 0x54AB,0x54C2,0x54A4,0x54BE,0x54BC,0x54D8,0x54E5,0x54E6, 0x550F,0x5514,0x54FD,0x54EE,0x54ED,0x54FA,0x54E2,0x5539, 0x5540,0x5563,0x554C,0x552E,0x555C,0x5545,0x5556,0x5557, @@ -908,7 +908,7 @@ static uint16 tab_jisx0208_uni43[]={ 0x56EE,0x56F9,0x5700,0x56FF,0x5704,0x5709}; /* page 44 0x5421-0x547E */ -static uint16 tab_jisx0208_uni44[]={ +static const uint16 tab_jisx0208_uni44[]={ 0x5708,0x570B,0x570D,0x5713,0x5718,0x5716,0x55C7,0x571C, 0x5726,0x5737,0x5738,0x574E,0x573B,0x5740,0x574F,0x5769, 0x57C0,0x5788,0x5761,0x577F,0x5789,0x5793,0x57A0,0x57B3, @@ -923,7 +923,7 @@ static uint16 tab_jisx0208_uni44[]={ 0x5958,0x5962,0x5960,0x5967,0x596C,0x5969}; /* page 45 0x5521-0x557E */ -static uint16 tab_jisx0208_uni45[]={ +static const uint16 tab_jisx0208_uni45[]={ 0x5978,0x5981,0x599D,0x4F5E,0x4FAB,0x59A3,0x59B2,0x59C6, 0x59E8,0x59DC,0x598D,0x59D9,0x59DA,0x5A25,0x5A1F,0x5A11, 0x5A1C,0x5A09,0x5A1A,0x5A40,0x5A6C,0x5A49,0x5A35,0x5A36, @@ -938,7 +938,7 @@ static uint16 tab_jisx0208_uni45[]={ 0x5C38,0x5C39,0x5C41,0x5C46,0x5C4E,0x5C53}; /* page 46 0x5621-0x567E */ -static uint16 tab_jisx0208_uni46[]={ +static const uint16 tab_jisx0208_uni46[]={ 0x5C50,0x5C4F,0x5B71,0x5C6C,0x5C6E,0x4E62,0x5C76,0x5C79, 0x5C8C,0x5C91,0x5C94,0x599B,0x5CAB,0x5CBB,0x5CB6,0x5CBC, 0x5CB7,0x5CC5,0x5CBE,0x5CC7,0x5CD9,0x5CE9,0x5CFD,0x5CFA, @@ -953,7 +953,7 @@ static uint16 tab_jisx0208_uni46[]={ 0x5EA0,0x5EC1,0x5EC2,0x5EC8,0x5ED0,0x5ECF}; /* page 47 0x5721-0x577E */ -static uint16 tab_jisx0208_uni47[]={ +static const uint16 tab_jisx0208_uni47[]={ 0x5ED6,0x5EE3,0x5EDD,0x5EDA,0x5EDB,0x5EE2,0x5EE1,0x5EE8, 0x5EE9,0x5EEC,0x5EF1,0x5EF3,0x5EF0,0x5EF4,0x5EF8,0x5EFE, 0x5F03,0x5F09,0x5F5D,0x5F5C,0x5F0B,0x5F11,0x5F16,0x5F29, @@ -968,7 +968,7 @@ static uint16 tab_jisx0208_uni47[]={ 0x6059,0x6081,0x608D,0x60E7,0x6083,0x609A}; /* page 48 0x5821-0x587E */ -static uint16 tab_jisx0208_uni48[]={ +static const uint16 tab_jisx0208_uni48[]={ 0x6084,0x609B,0x6096,0x6097,0x6092,0x60A7,0x608B,0x60E1, 0x60B8,0x60E0,0x60D3,0x60B4,0x5FF0,0x60BD,0x60C6,0x60B5, 0x60D8,0x614D,0x6115,0x6106,0x60F6,0x60F7,0x6100,0x60F4, @@ -983,7 +983,7 @@ static uint16 tab_jisx0208_uni48[]={ 0x6208,0x6209,0x620D,0x620C,0x6214,0x621B}; /* page 49 0x5921-0x597E */ -static uint16 tab_jisx0208_uni49[]={ +static const uint16 tab_jisx0208_uni49[]={ 0x621E,0x6221,0x622A,0x622E,0x6230,0x6232,0x6233,0x6241, 0x624E,0x625E,0x6263,0x625B,0x6260,0x6268,0x627C,0x6282, 0x6289,0x627E,0x6292,0x6293,0x6296,0x62D4,0x6283,0x6294, @@ -998,7 +998,7 @@ static uint16 tab_jisx0208_uni49[]={ 0x6495,0x6493,0x64A5,0x64A9,0x6488,0x64BC}; /* page 50 0x5A21-0x5A7E */ -static uint16 tab_jisx0208_uni50[]={ +static const uint16 tab_jisx0208_uni50[]={ 0x64DA,0x64D2,0x64C5,0x64C7,0x64BB,0x64D8,0x64C2,0x64F1, 0x64E7,0x8209,0x64E0,0x64E1,0x62AC,0x64E3,0x64EF,0x652C, 0x64F6,0x64F4,0x64F2,0x64FA,0x6500,0x64FD,0x6518,0x651C, @@ -1013,7 +1013,7 @@ static uint16 tab_jisx0208_uni50[]={ 0x669D,0x66C1,0x66B9,0x66C9,0x66BE,0x66BC}; /* page 51 0x5B21-0x5B7E */ -static uint16 tab_jisx0208_uni51[]={ +static const uint16 tab_jisx0208_uni51[]={ 0x66C4,0x66B8,0x66D6,0x66DA,0x66E0,0x663F,0x66E6,0x66E9, 0x66F0,0x66F5,0x66F7,0x670F,0x6716,0x671E,0x6726,0x6727, 0x9738,0x672E,0x673F,0x6736,0x6741,0x6738,0x6737,0x6746, @@ -1028,7 +1028,7 @@ static uint16 tab_jisx0208_uni51[]={ 0x68D8,0x6922,0x6926,0x68E1,0x690C,0x68CD}; /* page 52 0x5C21-0x5C7E */ -static uint16 tab_jisx0208_uni52[]={ +static const uint16 tab_jisx0208_uni52[]={ 0x68D4,0x68E7,0x68D5,0x6936,0x6912,0x6904,0x68D7,0x68E3, 0x6925,0x68F9,0x68E0,0x68EF,0x6928,0x692A,0x691A,0x6923, 0x6921,0x68C6,0x6979,0x6977,0x695C,0x6978,0x696B,0x6954, @@ -1043,7 +1043,7 @@ static uint16 tab_jisx0208_uni52[]={ 0x6A90,0x6A8D,0x6AA0,0x6A84,0x6AA2,0x6AA3}; /* page 53 0x5D21-0x5D7E */ -static uint16 tab_jisx0208_uni53[]={ +static const uint16 tab_jisx0208_uni53[]={ 0x6A97,0x8617,0x6ABB,0x6AC3,0x6AC2,0x6AB8,0x6AB3,0x6AAC, 0x6ADE,0x6AD1,0x6ADF,0x6AAA,0x6ADA,0x6AEA,0x6AFB,0x6B05, 0x8616,0x6AFA,0x6B12,0x6B16,0x9B31,0x6B1F,0x6B38,0x6B37, @@ -1058,7 +1058,7 @@ static uint16 tab_jisx0208_uni53[]={ 0x6CD7,0x6CC5,0x6CDD,0x6CAE,0x6CB1,0x6CBE}; /* page 54 0x5E21-0x5E7E */ -static uint16 tab_jisx0208_uni54[]={ +static const uint16 tab_jisx0208_uni54[]={ 0x6CBA,0x6CDB,0x6CEF,0x6CD9,0x6CEA,0x6D1F,0x884D,0x6D36, 0x6D2B,0x6D3D,0x6D38,0x6D19,0x6D35,0x6D33,0x6D12,0x6D0C, 0x6D63,0x6D93,0x6D64,0x6D5A,0x6D79,0x6D59,0x6D8E,0x6D95, @@ -1073,7 +1073,7 @@ static uint16 tab_jisx0208_uni54[]={ 0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC}; /* page 55 0x5F21-0x5F7E */ -static uint16 tab_jisx0208_uni55[]={ +static const uint16 tab_jisx0208_uni55[]={ 0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80, 0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E, 0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9, @@ -1088,7 +1088,7 @@ static uint16 tab_jisx0208_uni55[]={ 0x71CE,0x71E0,0x71EC,0x71E7,0x71F5,0x71FC}; /* page 56 0x6021-0x607E */ -static uint16 tab_jisx0208_uni56[]={ +static const uint16 tab_jisx0208_uni56[]={ 0x71F9,0x71FF,0x720D,0x7210,0x721B,0x7228,0x722D,0x722C, 0x7230,0x7232,0x723B,0x723C,0x723F,0x7240,0x7246,0x724B, 0x7258,0x7274,0x727E,0x7282,0x7281,0x7287,0x7292,0x7296, @@ -1103,7 +1103,7 @@ static uint16 tab_jisx0208_uni56[]={ 0x749E,0x74A7,0x74CA,0x74CF,0x74D4,0x73F1}; /* page 57 0x6121-0x617E */ -static uint16 tab_jisx0208_uni57[]={ +static const uint16 tab_jisx0208_uni57[]={ 0x74E0,0x74E3,0x74E7,0x74E9,0x74EE,0x74F2,0x74F0,0x74F1, 0x74F8,0x74F7,0x7504,0x7503,0x7505,0x750C,0x750E,0x750D, 0x7515,0x7513,0x751E,0x7526,0x752C,0x753C,0x7544,0x754D, @@ -1118,7 +1118,7 @@ static uint16 tab_jisx0208_uni57[]={ 0x7668,0x7669,0x766A,0x7667,0x766C,0x7670}; /* page 58 0x6221-0x627E */ -static uint16 tab_jisx0208_uni58[]={ +static const uint16 tab_jisx0208_uni58[]={ 0x7672,0x7676,0x7678,0x767C,0x7680,0x7683,0x7688,0x768B, 0x768E,0x7696,0x7693,0x7699,0x769A,0x76B0,0x76B4,0x76B8, 0x76B9,0x76BA,0x76C2,0x76CD,0x76D6,0x76D2,0x76DE,0x76E1, @@ -1133,7 +1133,7 @@ static uint16 tab_jisx0208_uni58[]={ 0x78D4,0x78BE,0x78BC,0x78C5,0x78CA,0x78EC}; /* page 59 0x6321-0x637E */ -static uint16 tab_jisx0208_uni59[]={ +static const uint16 tab_jisx0208_uni59[]={ 0x78E7,0x78DA,0x78FD,0x78F4,0x7907,0x7912,0x7911,0x7919, 0x792C,0x792B,0x7940,0x7960,0x7957,0x795F,0x795A,0x7955, 0x7953,0x797A,0x797F,0x798A,0x799D,0x79A7,0x9F4B,0x79AA, @@ -1148,7 +1148,7 @@ static uint16 tab_jisx0208_uni59[]={ 0x7B19,0x7B1E,0x7B35,0x7B28,0x7B36,0x7B50}; /* page 60 0x6421-0x647E */ -static uint16 tab_jisx0208_uni60[]={ +static const uint16 tab_jisx0208_uni60[]={ 0x7B7A,0x7B04,0x7B4D,0x7B0B,0x7B4C,0x7B45,0x7B75,0x7B65, 0x7B74,0x7B67,0x7B70,0x7B71,0x7B6C,0x7B6E,0x7B9D,0x7B98, 0x7B9F,0x7B8D,0x7B9C,0x7B9A,0x7B8B,0x7B92,0x7B8F,0x7B5D, @@ -1163,7 +1163,7 @@ static uint16 tab_jisx0208_uni60[]={ 0x7CEF,0x7CF2,0x7CF4,0x7CF6,0x7CFA,0x7D06}; /* page 61 0x6521-0x657E */ -static uint16 tab_jisx0208_uni61[]={ +static const uint16 tab_jisx0208_uni61[]={ 0x7D02,0x7D1C,0x7D15,0x7D0A,0x7D45,0x7D4B,0x7D2E,0x7D32, 0x7D3F,0x7D35,0x7D46,0x7D73,0x7D56,0x7D4E,0x7D72,0x7D68, 0x7D6E,0x7D4F,0x7D63,0x7D93,0x7D89,0x7D5B,0x7D8F,0x7D7D, @@ -1178,7 +1178,7 @@ static uint16 tab_jisx0208_uni61[]={ 0x7E96,0x7E8E,0x7E9B,0x7E9C,0x7F38,0x7F3A}; /* page 62 0x6621-0x667E */ -static uint16 tab_jisx0208_uni62[]={ +static const uint16 tab_jisx0208_uni62[]={ 0x7F45,0x7F4C,0x7F4D,0x7F4E,0x7F50,0x7F51,0x7F55,0x7F54, 0x7F58,0x7F5F,0x7F60,0x7F68,0x7F69,0x7F67,0x7F78,0x7F82, 0x7F86,0x7F83,0x7F88,0x7F87,0x7F8C,0x7F94,0x7F9E,0x7F9D, @@ -1193,7 +1193,7 @@ static uint16 tab_jisx0208_uni62[]={ 0x80F1,0x811B,0x8129,0x8123,0x812F,0x814B}; /* page 63 0x6721-0x677E */ -static uint16 tab_jisx0208_uni63[]={ +static const uint16 tab_jisx0208_uni63[]={ 0x968B,0x8146,0x813E,0x8153,0x8151,0x80FC,0x8171,0x816E, 0x8165,0x8166,0x8174,0x8183,0x8188,0x818A,0x8180,0x8182, 0x81A0,0x8195,0x81A4,0x81A3,0x815F,0x8193,0x81A9,0x81B0, @@ -1208,7 +1208,7 @@ static uint16 tab_jisx0208_uni63[]={ 0x82F9,0x82DE,0x8306,0x82DC,0x8309,0x82D9}; /* page 64 0x6821-0x687E */ -static uint16 tab_jisx0208_uni64[]={ +static const uint16 tab_jisx0208_uni64[]={ 0x8335,0x8334,0x8316,0x8332,0x8331,0x8340,0x8339,0x8350, 0x8345,0x832F,0x832B,0x8317,0x8318,0x8385,0x839A,0x83AA, 0x839F,0x83A2,0x8396,0x8323,0x838E,0x8387,0x838A,0x837C, @@ -1223,7 +1223,7 @@ static uint16 tab_jisx0208_uni64[]={ 0x8514,0x84FC,0x8540,0x8563,0x8558,0x8548}; /* page 65 0x6921-0x697E */ -static uint16 tab_jisx0208_uni65[]={ +static const uint16 tab_jisx0208_uni65[]={ 0x8541,0x8602,0x854B,0x8555,0x8580,0x85A4,0x8588,0x8591, 0x858A,0x85A8,0x856D,0x8594,0x859B,0x85EA,0x8587,0x859C, 0x8577,0x857E,0x8590,0x85C9,0x85BA,0x85CF,0x85B9,0x85D0, @@ -1238,7 +1238,7 @@ static uint16 tab_jisx0208_uni65[]={ 0x874E,0x8774,0x8757,0x8768,0x876E,0x8759}; /* page 66 0x6A21-0x6A7E */ -static uint16 tab_jisx0208_uni66[]={ +static const uint16 tab_jisx0208_uni66[]={ 0x8753,0x8763,0x876A,0x8805,0x87A2,0x879F,0x8782,0x87AF, 0x87CB,0x87BD,0x87C0,0x87D0,0x96D6,0x87AB,0x87C4,0x87B3, 0x87C7,0x87C6,0x87BB,0x87EF,0x87F2,0x87E0,0x880F,0x880D, @@ -1253,7 +1253,7 @@ static uint16 tab_jisx0208_uni66[]={ 0x8936,0x8938,0x894C,0x891D,0x8960,0x895E}; /* page 67 0x6B21-0x6B7E */ -static uint16 tab_jisx0208_uni67[]={ +static const uint16 tab_jisx0208_uni67[]={ 0x8966,0x8964,0x896D,0x896A,0x896F,0x8974,0x8977,0x897E, 0x8983,0x8988,0x898A,0x8993,0x8998,0x89A1,0x89A9,0x89A6, 0x89AC,0x89AF,0x89B2,0x89BA,0x89BD,0x89BF,0x89C0,0x89DA, @@ -1268,7 +1268,7 @@ static uint16 tab_jisx0208_uni67[]={ 0x8B4E,0x8B49,0x8B56,0x8B5B,0x8B5A,0x8B6B}; /* page 68 0x6C21-0x6C7E */ -static uint16 tab_jisx0208_uni68[]={ +static const uint16 tab_jisx0208_uni68[]={ 0x8B5F,0x8B6C,0x8B6F,0x8B74,0x8B7D,0x8B80,0x8B8C,0x8B8E, 0x8B92,0x8B93,0x8B96,0x8B99,0x8B9A,0x8C3A,0x8C41,0x8C3F, 0x8C48,0x8C4C,0x8C4E,0x8C50,0x8C55,0x8C62,0x8C6C,0x8C78, @@ -1283,7 +1283,7 @@ static uint16 tab_jisx0208_uni68[]={ 0x8E1F,0x8E42,0x8E35,0x8E30,0x8E34,0x8E4A}; /* page 69 0x6D21-0x6D7E */ -static uint16 tab_jisx0208_uni69[]={ +static const uint16 tab_jisx0208_uni69[]={ 0x8E47,0x8E49,0x8E4C,0x8E50,0x8E48,0x8E59,0x8E64,0x8E60, 0x8E2A,0x8E63,0x8E55,0x8E76,0x8E72,0x8E7C,0x8E81,0x8E87, 0x8E85,0x8E84,0x8E8B,0x8E8A,0x8E93,0x8E91,0x8E94,0x8E99, @@ -1298,7 +1298,7 @@ static uint16 tab_jisx0208_uni69[]={ 0x900B,0x9027,0x9036,0x9035,0x9039,0x8FF8}; /* page 70 0x6E21-0x6E7E */ -static uint16 tab_jisx0208_uni70[]={ +static const uint16 tab_jisx0208_uni70[]={ 0x904F,0x9050,0x9051,0x9052,0x900E,0x9049,0x903E,0x9056, 0x9058,0x905E,0x9068,0x906F,0x9076,0x96A8,0x9072,0x9082, 0x907D,0x9081,0x9080,0x908A,0x9089,0x908F,0x90A8,0x90AF, @@ -1313,7 +1313,7 @@ static uint16 tab_jisx0208_uni70[]={ 0x92B7,0x92E9,0x930F,0x92FA,0x9344,0x932E}; /* page 71 0x6F21-0x6F7E */ -static uint16 tab_jisx0208_uni71[]={ +static const uint16 tab_jisx0208_uni71[]={ 0x9319,0x9322,0x931A,0x9323,0x933A,0x9335,0x933B,0x935C, 0x9360,0x937C,0x936E,0x9356,0x93B0,0x93AC,0x93AD,0x9394, 0x93B9,0x93D6,0x93D7,0x93E8,0x93E5,0x93D8,0x93C3,0x93DD, @@ -1328,7 +1328,7 @@ static uint16 tab_jisx0208_uni71[]={ 0x964C,0x964F,0x964B,0x9677,0x965C,0x965E}; /* page 72 0x7021-0x707E */ -static uint16 tab_jisx0208_uni72[]={ +static const uint16 tab_jisx0208_uni72[]={ 0x965D,0x965F,0x9666,0x9672,0x966C,0x968D,0x9698,0x9695, 0x9697,0x96AA,0x96A7,0x96B1,0x96B2,0x96B0,0x96B4,0x96B6, 0x96B8,0x96B9,0x96CE,0x96CB,0x96C9,0x96CD,0x894D,0x96DC, @@ -1343,7 +1343,7 @@ static uint16 tab_jisx0208_uni72[]={ 0x9846,0x984F,0x984B,0x986B,0x986F,0x9870}; /* page 73 0x7121-0x717E */ -static uint16 tab_jisx0208_uni73[]={ +static const uint16 tab_jisx0208_uni73[]={ 0x9871,0x9874,0x9873,0x98AA,0x98AF,0x98B1,0x98B6,0x98C4, 0x98C3,0x98C6,0x98E9,0x98EB,0x9903,0x9909,0x9912,0x9914, 0x9918,0x9921,0x991D,0x991E,0x9924,0x9920,0x992C,0x992E, @@ -1358,7 +1358,7 @@ static uint16 tab_jisx0208_uni73[]={ 0x9AEF,0x9AEB,0x9AEE,0x9AF4,0x9AF1,0x9AF7}; /* page 74 0x7221-0x727E */ -static uint16 tab_jisx0208_uni74[]={ +static const uint16 tab_jisx0208_uni74[]={ 0x9AFB,0x9B06,0x9B18,0x9B1A,0x9B1F,0x9B22,0x9B23,0x9B25, 0x9B27,0x9B28,0x9B29,0x9B2A,0x9B2E,0x9B2F,0x9B32,0x9B44, 0x9B43,0x9B4F,0x9B4D,0x9B4E,0x9B51,0x9B58,0x9B74,0x9B93, @@ -1373,7 +1373,7 @@ static uint16 tab_jisx0208_uni74[]={ 0x9D12,0x9D41,0x9D3F,0x9D3E,0x9D46,0x9D48}; /* page 75 0x7321-0x737E */ -static uint16 tab_jisx0208_uni75[]={ +static const uint16 tab_jisx0208_uni75[]={ 0x9D5D,0x9D5E,0x9D64,0x9D51,0x9D50,0x9D59,0x9D72,0x9D89, 0x9D87,0x9DAB,0x9D6F,0x9D7A,0x9D9A,0x9DA4,0x9DA9,0x9DB2, 0x9DC4,0x9DC1,0x9DBB,0x9DB8,0x9DBA,0x9DC6,0x9DCF,0x9DC2, @@ -1388,7 +1388,7 @@ static uint16 tab_jisx0208_uni75[]={ 0x9F77,0x9F72,0x9F76,0x9F95,0x9F9C,0x9FA0}; /* page 76 0x7421-0x7426 */ -static uint16 tab_jisx0208_uni76[]={ +static const uint16 tab_jisx0208_uni76[]={ 0x582F,0x69C7,0x9059,0x7464,0x51DC,0x7199}; static int @@ -1552,25 +1552,25 @@ my_jisx0208_uni_onechar(int code){ /* page 0 0x005C-0x005C */ -static uint16 tab_uni_jisx02080[]={ +static const uint16 tab_uni_jisx02080[]={ 0x2140}; /* page 1 0x00A2-0x00B6 */ -static uint16 tab_uni_jisx02081[]={ +static const uint16 tab_uni_jisx02081[]={ 0x2171,0x2172, 0, 0, 0,0x2178,0x212F, 0, 0, 0,0x224C, 0, 0, 0,0x216B,0x215E, 0, 0,0x212D, 0,0x2279}; /* page 2 0x00D7-0x00D7 */ -static uint16 tab_uni_jisx02082[]={ +static const uint16 tab_uni_jisx02082[]={ 0x215F}; /* page 3 0x00F7-0x00F7 */ -static uint16 tab_uni_jisx02083[]={ +static const uint16 tab_uni_jisx02083[]={ 0x2160}; /* page 4 0x0391-0x03C9 */ -static uint16 tab_uni_jisx02084[]={ +static const uint16 tab_uni_jisx02084[]={ 0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628, 0x2629,0x262A,0x262B,0x262C,0x262D,0x262E,0x262F,0x2630, 0x2631, 0,0x2632,0x2633,0x2634,0x2635,0x2636,0x2637, @@ -1581,7 +1581,7 @@ static uint16 tab_uni_jisx02084[]={ 0x2658}; /* page 5 0x0401-0x0451 */ -static uint16 tab_uni_jisx02085[]={ +static const uint16 tab_uni_jisx02085[]={ 0x2727, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2721, 0x2722,0x2723,0x2724,0x2725,0x2726,0x2728,0x2729,0x272A, @@ -1595,7 +1595,7 @@ static uint16 tab_uni_jisx02085[]={ 0x2757}; /* page 6 0x2010-0x203B */ -static uint16 tab_uni_jisx02086[]={ +static const uint16 tab_uni_jisx02086[]={ 0x213E, 0, 0, 0, 0,0x213D,0x2142, 0, 0x2146,0x2147, 0, 0,0x2148,0x2149, 0, 0, 0x2277,0x2278, 0, 0, 0,0x2145,0x2144, 0, @@ -1604,23 +1604,23 @@ static uint16 tab_uni_jisx02086[]={ 0, 0, 0,0x2228}; /* page 7 0x2103-0x2103 */ -static uint16 tab_uni_jisx02087[]={ +static const uint16 tab_uni_jisx02087[]={ 0x216E}; /* page 8 0x212B-0x212B */ -static uint16 tab_uni_jisx02088[]={ +static const uint16 tab_uni_jisx02088[]={ 0x2272}; /* page 9 0x2190-0x2193 */ -static uint16 tab_uni_jisx02089[]={ +static const uint16 tab_uni_jisx02089[]={ 0x222B,0x222C,0x222A,0x222D}; /* page 10 0x21D2-0x21D4 */ -static uint16 tab_uni_jisx020810[]={ +static const uint16 tab_uni_jisx020810[]={ 0x224D, 0,0x224E}; /* page 11 0x2200-0x223D */ -static uint16 tab_uni_jisx020811[]={ +static const uint16 tab_uni_jisx020811[]={ 0x224F, 0,0x225F,0x2250, 0, 0, 0,0x2260, 0x223A, 0, 0,0x223B, 0, 0, 0, 0, 0, 0,0x215D, 0, 0, 0, 0, 0, @@ -1631,26 +1631,26 @@ static uint16 tab_uni_jisx020811[]={ 0, 0, 0, 0, 0,0x2266}; /* page 12 0x2252-0x226B */ -static uint16 tab_uni_jisx020812[]={ +static const uint16 tab_uni_jisx020812[]={ 0x2262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2162,0x2261, 0, 0, 0, 0,0x2165,0x2166, 0, 0, 0x2263,0x2264}; /* page 13 0x2282-0x2287 */ -static uint16 tab_uni_jisx020813[]={ +static const uint16 tab_uni_jisx020813[]={ 0x223E,0x223F, 0, 0,0x223C,0x223D}; /* page 14 0x22A5-0x22A5 */ -static uint16 tab_uni_jisx020814[]={ +static const uint16 tab_uni_jisx020814[]={ 0x225D}; /* page 15 0x2312-0x2312 */ -static uint16 tab_uni_jisx020815[]={ +static const uint16 tab_uni_jisx020815[]={ 0x225E}; /* page 16 0x2500-0x254B */ -static uint16 tab_uni_jisx020816[]={ +static const uint16 tab_uni_jisx020816[]={ 0x2821,0x282C,0x2822,0x282D, 0, 0, 0, 0, 0, 0, 0, 0,0x2823, 0, 0,0x282E, 0x2824, 0, 0,0x282F,0x2826, 0, 0,0x2831, @@ -1663,7 +1663,7 @@ static uint16 tab_uni_jisx020816[]={ 0, 0, 0,0x2836}; /* page 17 0x25A0-0x25CF */ -static uint16 tab_uni_jisx020817[]={ +static const uint16 tab_uni_jisx020817[]={ 0x2223,0x2222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x2225,0x2224, 0, 0, 0, 0, @@ -1673,30 +1673,30 @@ static uint16 tab_uni_jisx020817[]={ }; /* page 18 0x25EF-0x25EF */ -static uint16 tab_uni_jisx020818[]={ +static const uint16 tab_uni_jisx020818[]={ 0x227E}; /* page 19 0x2605-0x2606 */ -static uint16 tab_uni_jisx020819[]={ +static const uint16 tab_uni_jisx020819[]={ 0x217A,0x2179}; /* page 20 0x2640-0x2642 */ -static uint16 tab_uni_jisx020820[]={ +static const uint16 tab_uni_jisx020820[]={ 0x216A, 0,0x2169}; /* page 21 0x266A-0x266F */ -static uint16 tab_uni_jisx020821[]={ +static const uint16 tab_uni_jisx020821[]={ 0x2276, 0, 0,0x2275, 0,0x2274}; /* page 22 0x3000-0x301C */ -static uint16 tab_uni_jisx020822[]={ +static const uint16 tab_uni_jisx020822[]={ 0x2121,0x2122,0x2123,0x2137, 0,0x2139,0x213A,0x213B, 0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159, 0x215A,0x215B,0x2229,0x222E,0x214C,0x214D, 0, 0, 0, 0, 0, 0,0x2141}; /* page 23 0x3041-0x30FE */ -static uint16 tab_uni_jisx020823[]={ +static const uint16 tab_uni_jisx020823[]={ 0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428, 0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,0x2430, 0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438, @@ -1723,7 +1723,7 @@ static uint16 tab_uni_jisx020823[]={ 0, 0,0x2126,0x213C,0x2133,0x2134}; /* page 24 0x4E00-0x5516 */ -static uint16 tab_uni_jisx020824[]={ +static const uint16 tab_uni_jisx020824[]={ 0x306C,0x437A, 0,0x3C37, 0, 0, 0,0x4B7C, 0x3E66,0x3B30,0x3E65,0x323C, 0,0x4954,0x4D3F, 0, 0x5022,0x312F, 0, 0,0x336E,0x5023,0x4024,0x5242, @@ -1953,7 +1953,7 @@ static uint16 tab_uni_jisx020824[]={ 0x4562, 0, 0, 0,0x532A, 0,0x3022}; /* page 25 0x552E-0x5563 */ -static uint16 tab_uni_jisx020825[]={ +static const uint16 tab_uni_jisx020825[]={ 0x5334,0x4D23, 0,0x3E27, 0,0x533A, 0, 0, 0, 0,0x5339,0x5330, 0, 0, 0, 0, 0x4243, 0,0x5331, 0, 0, 0,0x426F,0x5336, @@ -1963,7 +1963,7 @@ static uint16 tab_uni_jisx020825[]={ 0, 0, 0, 0, 0,0x5332}; /* page 26 0x557B-0x576A */ -static uint16 tab_uni_jisx020826[]={ +static const uint16 tab_uni_jisx020826[]={ 0x5341,0x5346, 0,0x5342, 0,0x533D, 0, 0, 0x5347,0x4131, 0, 0,0x5349, 0,0x3922,0x533F, 0x437D, 0, 0, 0, 0, 0, 0, 0, @@ -2029,7 +2029,7 @@ static uint16 tab_uni_jisx020826[]={ }; /* page 27 0x577F-0x5A9B */ -static uint16 tab_uni_jisx020827[]={ +static const uint16 tab_uni_jisx020827[]={ 0x5434, 0, 0,0x3F62, 0, 0, 0, 0, 0,0x5432,0x5435, 0,0x373F, 0, 0, 0, 0, 0, 0, 0,0x5436, 0, 0, 0, @@ -2132,7 +2132,7 @@ static uint16 tab_uni_jisx020827[]={ 0, 0, 0,0x553B,0x4932}; /* page 28 0x5ABC-0x5D29 */ -static uint16 tab_uni_jisx020828[]={ +static const uint16 tab_uni_jisx020828[]={ 0x553C,0x5540,0x553D, 0, 0,0x3247,0x553F, 0, 0, 0, 0, 0, 0,0x3C3B, 0,0x553E, 0x3779, 0, 0, 0,0x554C, 0, 0, 0, @@ -2213,7 +2213,7 @@ static uint16 tab_uni_jisx020828[]={ 0, 0, 0, 0, 0,0x4A78}; /* page 29 0x5D4B-0x6BF3 */ -static uint16 tab_uni_jisx020829[]={ +static const uint16 tab_uni_jisx020829[]={ 0x564B,0x5648, 0,0x564A, 0,0x4D72, 0,0x5649, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x563F, 0, 0, 0, 0, 0, 0, @@ -2686,7 +2686,7 @@ static uint16 tab_uni_jisx020829[]={ 0x5D5E}; /* page 30 0x6C08-0x6CF3 */ -static uint16 tab_uni_jisx020830[]={ +static const uint16 tab_uni_jisx020830[]={ 0x5D61, 0, 0, 0, 0, 0, 0,0x3B61, 0,0x4C31, 0,0x5D62,0x5D63, 0, 0,0x3524, 0, 0, 0,0x5D64, 0, 0, 0, 0, @@ -2719,7 +2719,7 @@ static uint16 tab_uni_jisx020830[]={ 0x4259,0x5D76, 0,0x314B}; /* page 31 0x6D0B-0x7409 */ -static uint16 tab_uni_jisx020831[]={ +static const uint16 tab_uni_jisx020831[]={ 0x4D4E,0x5E30, 0, 0, 0, 0, 0,0x5E2F, 0, 0, 0, 0,0x4076, 0,0x5E2C, 0, 0x4D6C, 0, 0,0x4636,0x5E26, 0, 0, 0, @@ -2946,7 +2946,7 @@ static uint16 tab_uni_jisx020831[]={ 0x3565, 0,0x6066,0x4D7D, 0, 0,0x4E30}; /* page 32 0x7422-0x7845 */ -static uint16 tab_uni_jisx020832[]={ +static const uint16 tab_uni_jisx020832[]={ 0x4276, 0, 0,0x6068, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x606A,0x4E56,0x3657,0x487C,0x474A, 0, 0, 0, @@ -3082,7 +3082,7 @@ static uint16 tab_uni_jisx020832[]={ 0, 0, 0,0x626B}; /* page 33 0x785D-0x7E9C */ -static uint16 tab_uni_jisx020833[]={ +static const uint16 tab_uni_jisx020833[]={ 0x3E4B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x4E32,0x3945, 0, 0,0x3827, 0, 0,0x4823, 0,0x626D, @@ -3286,7 +3286,7 @@ static uint16 tab_uni_jisx020833[]={ }; /* page 34 0x7F36-0x8358 */ -static uint16 tab_uni_jisx020834[]={ +static const uint16 tab_uni_jisx020834[]={ 0x344C, 0,0x657D, 0,0x657E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x6621, 0, 0, 0, 0, 0, 0,0x6622,0x6623, @@ -3422,7 +3422,7 @@ static uint16 tab_uni_jisx020834[]={ 0, 0,0x4171}; /* page 35 0x8373-0x8B9A */ -static uint16 tab_uni_jisx020835[]={ +static const uint16 tab_uni_jisx020835[]={ 0x683A, 0,0x683B, 0,0x3259, 0, 0, 0, 0x322E,0x6838, 0, 0, 0, 0, 0, 0, 0, 0,0x682E, 0,0x6836, 0,0x683D,0x6837, @@ -3687,7 +3687,7 @@ static uint16 tab_uni_jisx020835[]={ }; /* page 36 0x8C37-0x8D16 */ -static uint16 tab_uni_jisx020836[]={ +static const uint16 tab_uni_jisx020836[]={ 0x432B, 0, 0,0x6C2E, 0, 0, 0, 0, 0x6C30, 0,0x6C2F, 0, 0, 0, 0,0x4626, 0,0x6C31, 0,0x4B2D, 0,0x6C32, 0,0x6C33, @@ -3719,7 +3719,7 @@ static uint16 tab_uni_jisx020836[]={ }; /* page 37 0x8D64-0x8F64 */ -static uint16 tab_uni_jisx020837[]={ +static const uint16 tab_uni_jisx020837[]={ 0x4056, 0,0x3C4F,0x6C5F, 0, 0, 0,0x3352, 0,0x6C60, 0, 0,0x4176,0x6C61, 0,0x6C62, 0x496B, 0, 0,0x352F, 0, 0, 0, 0, @@ -3787,7 +3787,7 @@ static uint16 tab_uni_jisx020837[]={ 0x6D62}; /* page 38 0x8F9B-0x9132 */ -static uint16 tab_uni_jisx020838[]={ +static const uint16 tab_uni_jisx020838[]={ 0x3F49,0x6D63, 0,0x3C2D,0x6D64, 0, 0, 0, 0x6D65, 0, 0, 0,0x5221,0x517E, 0, 0, 0, 0,0x6D66,0x6570,0x6D67,0x4324,0x3F2B,0x4740, @@ -3842,7 +3842,7 @@ static uint16 tab_uni_jisx020838[]={ }; /* page 39 0x9149-0x92B9 */ -static uint16 tab_uni_jisx020839[]={ +static const uint16 tab_uni_jisx020839[]={ 0x4653,0x6E44,0x3D36,0x3C60,0x475B,0x4371, 0, 0, 0,0x3C72, 0,0x3F6C, 0,0x6E45, 0,0x6E46, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3892,7 +3892,7 @@ static uint16 tab_uni_jisx020839[]={ 0x6E78}; /* page 40 0x92CF-0x93E8 */ -static uint16 tab_uni_jisx020840[]={ +static const uint16 tab_uni_jisx020840[]={ 0x6E77, 0, 0,0x4B2F, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3D7B, 0, 0, @@ -3931,7 +3931,7 @@ static uint16 tab_uni_jisx020840[]={ 0,0x6F34}; /* page 41 0x9403-0x9481 */ -static uint16 tab_uni_jisx020841[]={ +static const uint16 tab_uni_jisx020841[]={ 0x6F3F, 0, 0, 0,0x6F40, 0, 0, 0, 0, 0, 0, 0, 0,0x6F41, 0, 0, 0x6F3E,0x6F3D, 0, 0, 0,0x3E62,0x462A,0x6F3C, @@ -3950,7 +3950,7 @@ static uint16 tab_uni_jisx020841[]={ 0,0x6F55,0x6F53,0x6F56,0x6F58, 0,0x6F57}; /* page 42 0x9577-0x95E5 */ -static uint16 tab_uni_jisx020842[]={ +static const uint16 tab_uni_jisx020842[]={ 0x4439, 0, 0, 0, 0, 0, 0, 0, 0,0x4C67, 0,0x6F59,0x412E, 0, 0, 0, 0x6F5A, 0,0x4A44,0x6F5B,0x332B, 0, 0, 0, @@ -3967,7 +3967,7 @@ static uint16 tab_uni_jisx020842[]={ 0, 0,0x6F71,0x6F73, 0, 0,0x6F72}; /* page 43 0x961C-0x9874 */ -static uint16 tab_uni_jisx020843[]={ +static const uint16 tab_uni_jisx020843[]={ 0x496C, 0, 0, 0, 0,0x6F74, 0, 0, 0, 0, 0, 0,0x6F75, 0,0x3A65, 0, 0, 0,0x6F76,0x6F77, 0, 0,0x4B49, 0, @@ -4046,14 +4046,14 @@ static uint16 tab_uni_jisx020843[]={ 0x7122}; /* page 44 0x98A8-0x98C6 */ -static uint16 tab_uni_jisx020844[]={ +static const uint16 tab_uni_jisx020844[]={ 0x4977, 0,0x7124, 0, 0, 0, 0,0x7125, 0,0x7126, 0, 0, 0, 0,0x7127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7129,0x7128, 0,0x712A}; /* page 45 0x98DB-0x9957 */ -static uint16 tab_uni_jisx020845[]={ +static const uint16 tab_uni_jisx020845[]={ 0x4874,0x664C, 0, 0,0x3F29, 0, 0,0x3532, 0, 0, 0, 0, 0, 0,0x712B, 0, 0x712C, 0,0x522C,0x5D3B,0x4853, 0, 0,0x307B, @@ -4072,7 +4072,7 @@ static uint16 tab_uni_jisx020845[]={ 0, 0,0x7143, 0,0x3642}; /* page 46 0x9996-0x9A6B */ -static uint16 tab_uni_jisx020846[]={ +static const uint16 tab_uni_jisx020846[]={ 0x3C73,0x7144,0x7145,0x3961, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7146, 0, 0,0x333E, 0, 0, 0,0x474F,0x7147, @@ -4102,7 +4102,7 @@ static uint16 tab_uni_jisx020846[]={ 0, 0, 0,0x7169,0x716B,0x716A}; /* page 47 0x9AA8-0x9B5A */ -static uint16 tab_uni_jisx020847[]={ +static const uint16 tab_uni_jisx020847[]={ 0x397C, 0, 0, 0, 0,0x716C, 0, 0, 0x716D, 0, 0, 0, 0, 0, 0, 0, 0x333C, 0, 0, 0,0x716E, 0, 0, 0, @@ -4128,7 +4128,7 @@ static uint16 tab_uni_jisx020847[]={ 0x7236, 0,0x357B}; /* page 48 0x9B6F-0x9C78 */ -static uint16 tab_uni_jisx020848[]={ +static const uint16 tab_uni_jisx020848[]={ 0x4F25, 0, 0, 0, 0,0x7237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x7239, 0, 0, 0, @@ -4165,7 +4165,7 @@ static uint16 tab_uni_jisx020848[]={ 0,0x7269}; /* page 49 0x9CE5-0x9DFD */ -static uint16 tab_uni_jisx020849[]={ +static const uint16 tab_uni_jisx020849[]={ 0x443B, 0,0x726A, 0,0x4837, 0,0x726F,0x726B, 0, 0, 0,0x726C, 0, 0,0x4B31,0x4C44, 0,0x4650, 0, 0, 0, 0, 0, 0, @@ -4204,11 +4204,11 @@ static uint16 tab_uni_jisx020849[]={ 0x733F}; /* page 50 0x9E1A-0x9E1E */ -static uint16 tab_uni_jisx020850[]={ +static const uint16 tab_uni_jisx020850[]={ 0x7340,0x7341, 0, 0,0x7342}; /* page 51 0x9E75-0x9F77 */ -static uint16 tab_uni_jisx020851[]={ +static const uint16 tab_uni_jisx020851[]={ 0x7343, 0, 0,0x3834,0x7344, 0, 0, 0, 0x7345, 0,0x3C2F, 0,0x7346, 0, 0, 0, 0, 0, 0,0x7347, 0, 0,0x7348,0x7349, @@ -4244,13 +4244,13 @@ static uint16 tab_uni_jisx020851[]={ 0,0x737B,0x7379}; /* page 52 0x9F8D-0x9FA0 */ -static uint16 tab_uni_jisx020852[]={ +static const uint16 tab_uni_jisx020852[]={ 0x4E36, 0, 0, 0, 0, 0, 0, 0, 0x737C, 0, 0, 0, 0, 0, 0,0x737D, 0x6354, 0, 0,0x737E}; /* page 53 0xFF01-0xFF5D */ -static uint16 tab_uni_jisx020853[]={ +static const uint16 tab_uni_jisx020853[]={ 0x212A, 0,0x2174,0x2170,0x2173,0x2175, 0,0x214A, 0x214B,0x2176,0x215C,0x2124, 0,0x2125,0x213F,0x2330, 0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338, @@ -4265,7 +4265,7 @@ static uint16 tab_uni_jisx020853[]={ 0x2379,0x237A,0x2150,0x2143,0x2151}; /* page 54 0xFFE3-0xFFE5 */ -static uint16 tab_uni_jisx020854[]={ +static const uint16 tab_uni_jisx020854[]={ 0x2131, 0,0x216F}; static int @@ -4386,11 +4386,11 @@ my_uni_jisx0208_onechar(int code){ /* page 0 0x007E-0x007E */ -static uint16 tab_uni_jisx02120[]={ +static const uint16 tab_uni_jisx02120[]={ 0x2237}; /* page 1 0x00A1-0x017E */ -static uint16 tab_uni_jisx02121[]={ +static const uint16 tab_uni_jisx02121[]={ 0x2242, 0, 0,0x2270, 0,0x2243, 0, 0, 0x226D,0x226C, 0, 0, 0,0x226E,0x2234, 0, 0, 0, 0, 0, 0, 0, 0,0x2231, @@ -4421,28 +4421,28 @@ static uint16 tab_uni_jisx02121[]={ 0x2A75,0x2B75,0x2A77,0x2B77,0x2A76,0x2B76}; /* page 2 0x01CD-0x01DC */ -static uint16 tab_uni_jisx02122[]={ +static const uint16 tab_uni_jisx02122[]={ 0x2A26,0x2B26,0x2A43,0x2B43,0x2A55,0x2B55,0x2A67,0x2B67, 0x2A70,0x2B70,0x2A6D,0x2B6D,0x2A6F,0x2B6F,0x2A6E,0x2B6E }; /* page 3 0x01F5-0x01F5 */ -static uint16 tab_uni_jisx02123[]={ +static const uint16 tab_uni_jisx02123[]={ 0x2B39}; /* page 4 0x02C7-0x02DD */ -static uint16 tab_uni_jisx02124[]={ +static const uint16 tab_uni_jisx02124[]={ 0x2230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x222F,0x2232,0x2236,0x2235, 0,0x2233}; /* page 5 0x0384-0x0390 */ -static uint16 tab_uni_jisx02125[]={ +static const uint16 tab_uni_jisx02125[]={ 0x2238,0x2239,0x2661, 0,0x2662,0x2663,0x2664, 0, 0x2667, 0,0x2669,0x266C,0x2676}; /* page 6 0x03AA-0x03CE */ -static uint16 tab_uni_jisx02126[]={ +static const uint16 tab_uni_jisx02126[]={ 0x2665,0x266A,0x2671,0x2672,0x2673,0x2674,0x267B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4450,22 +4450,22 @@ static uint16 tab_uni_jisx02126[]={ 0x2675,0x267A,0x2677,0x2679,0x267C}; /* page 7 0x0402-0x040F */ -static uint16 tab_uni_jisx02127[]={ +static const uint16 tab_uni_jisx02127[]={ 0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,0x2748,0x2749, 0x274A,0x274B,0x274C, 0,0x274D,0x274E}; /* page 8 0x0452-0x045F */ -static uint16 tab_uni_jisx02128[]={ +static const uint16 tab_uni_jisx02128[]={ 0x2772,0x2773,0x2774,0x2775,0x2776,0x2777,0x2778,0x2779, 0x277A,0x277B,0x277C, 0,0x277D,0x277E}; /* page 9 0x2116-0x2122 */ -static uint16 tab_uni_jisx02129[]={ +static const uint16 tab_uni_jisx02129[]={ 0x2271, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x226F}; /* page 10 0x4E02-0x4F19 */ -static uint16 tab_uni_jisx021210[]={ +static const uint16 tab_uni_jisx021210[]={ 0x3021, 0,0x3022,0x3023, 0, 0, 0, 0, 0, 0,0x3024, 0, 0, 0, 0, 0, 0x3025, 0, 0, 0, 0, 0, 0, 0, @@ -4504,7 +4504,7 @@ static uint16 tab_uni_jisx021210[]={ }; /* page 11 0x4F2E-0x5166 */ -static uint16 tab_uni_jisx021211[]={ +static const uint16 tab_uni_jisx021211[]={ 0x305D, 0, 0,0x305E, 0,0x3060, 0,0x3061, 0,0x3062, 0,0x3063, 0,0x3064, 0, 0, 0x3065, 0,0x3066, 0,0x3067, 0, 0, 0, @@ -4579,7 +4579,7 @@ static uint16 tab_uni_jisx021211[]={ 0x326E}; /* page 12 0x517E-0x5515 */ -static uint16 tab_uni_jisx021212[]={ +static const uint16 tab_uni_jisx021212[]={ 0x326F, 0, 0, 0, 0,0x3270,0x3271, 0, 0, 0, 0, 0, 0,0x3272, 0, 0, 0x3273, 0, 0, 0, 0, 0, 0, 0, @@ -4698,7 +4698,7 @@ static uint16 tab_uni_jisx021212[]={ }; /* page 13 0x552A-0x5566 */ -static uint16 tab_uni_jisx021213[]={ +static const uint16 tab_uni_jisx021213[]={ 0x354E,0x354F, 0, 0, 0, 0, 0, 0, 0x3550, 0, 0,0x3551,0x3552, 0, 0, 0, 0,0x3553,0x3554,0x3555, 0, 0, 0,0x3556, @@ -4709,7 +4709,7 @@ static uint16 tab_uni_jisx021213[]={ 0, 0,0x3563, 0,0x3564}; /* page 14 0x557F-0x5C36 */ -static uint16 tab_uni_jisx021214[]={ +static const uint16 tab_uni_jisx021214[]={ 0x3565, 0,0x3566,0x3567, 0, 0, 0,0x3568, 0,0x3569, 0, 0, 0, 0, 0,0x356A, 0x356B, 0,0x356C,0x356D,0x356E,0x356F, 0, 0, @@ -4928,7 +4928,7 @@ static uint16 tab_uni_jisx021214[]={ }; /* page 15 0x5C59-0x5EEB */ -static uint16 tab_uni_jisx021215[]={ +static const uint16 tab_uni_jisx021215[]={ 0x3A77,0x3A78, 0,0x3A79, 0, 0, 0, 0, 0,0x3A7A,0x3A7B, 0, 0, 0,0x3A7C,0x3A7D, 0x3A7E, 0, 0, 0,0x3B21, 0, 0,0x3B22, @@ -5014,7 +5014,7 @@ static uint16 tab_uni_jisx021215[]={ 0, 0,0x3C5B}; /* page 16 0x5F02-0x6149 */ -static uint16 tab_uni_jisx021216[]={ +static const uint16 tab_uni_jisx021216[]={ 0x3C5C, 0, 0, 0,0x3C5D,0x3C5E,0x3C5F, 0, 0, 0, 0, 0,0x3C60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3C61, @@ -5091,7 +5091,7 @@ static uint16 tab_uni_jisx021216[]={ }; /* page 17 0x615E-0x6290 */ -static uint16 tab_uni_jisx021217[]={ +static const uint16 tab_uni_jisx021217[]={ 0x3E53, 0,0x3E54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3E55, 0, 0, 0, 0, 0,0x3E56, 0, 0, 0, @@ -5133,7 +5133,7 @@ static uint16 tab_uni_jisx021217[]={ 0x3F46,0x3F47,0x3F48}; /* page 18 0x62A6-0x679B */ -static uint16 tab_uni_jisx021218[]={ +static const uint16 tab_uni_jisx021218[]={ 0x3F49, 0,0x3F4A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x3F4B, 0, 0, 0x3F4C,0x3F4D, 0, 0,0x3F4E, 0, 0, 0, @@ -5295,7 +5295,7 @@ static uint16 tab_uni_jisx021218[]={ 0x432D, 0,0x432E,0x432F, 0,0x4330}; /* page 19 0x67B0-0x67F9 */ -static uint16 tab_uni_jisx021219[]={ +static const uint16 tab_uni_jisx021219[]={ 0x4331,0x4332,0x4333, 0, 0,0x4334, 0, 0, 0, 0, 0,0x4335,0x4336,0x4337, 0, 0, 0x4339, 0,0x433A,0x433B, 0,0x433C, 0, 0, @@ -5308,7 +5308,7 @@ static uint16 tab_uni_jisx021219[]={ 0,0x4338}; /* page 20 0x6814-0x6917 */ -static uint16 tab_uni_jisx021220[]={ +static const uint16 tab_uni_jisx021220[]={ 0x434A, 0, 0, 0, 0,0x434B, 0, 0, 0,0x434C, 0,0x434D, 0, 0, 0, 0, 0, 0, 0,0x434F,0x434E, 0, 0, 0, @@ -5344,7 +5344,7 @@ static uint16 tab_uni_jisx021220[]={ 0, 0,0x443B,0x443C}; /* page 21 0x6931-0x6D3F */ -static uint16 tab_uni_jisx021221[]={ +static const uint16 tab_uni_jisx021221[]={ 0x443D, 0,0x443E, 0,0x443F, 0, 0,0x4440, 0, 0,0x4441, 0, 0, 0, 0, 0, 0,0x4442, 0, 0,0x4443, 0, 0, 0, @@ -5477,7 +5477,7 @@ static uint16 tab_uni_jisx021221[]={ 0x473A, 0, 0,0x473B, 0, 0,0x473C}; /* page 22 0x6D57-0x6E04 */ -static uint16 tab_uni_jisx021222[]={ +static const uint16 tab_uni_jisx021222[]={ 0x473D, 0, 0, 0, 0, 0, 0,0x473E, 0x473F, 0,0x4740, 0, 0, 0,0x4741, 0, 0x4742, 0, 0, 0, 0, 0, 0, 0, @@ -5502,7 +5502,7 @@ static uint16 tab_uni_jisx021222[]={ 0,0x4767, 0, 0, 0,0x4768}; /* page 23 0x6E1E-0x6ECF */ -static uint16 tab_uni_jisx021223[]={ +static const uint16 tab_uni_jisx021223[]={ 0x4769, 0, 0, 0,0x476A, 0, 0, 0, 0,0x476B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x476C, 0, 0, 0, @@ -5528,7 +5528,7 @@ static uint16 tab_uni_jisx021223[]={ 0x4839,0x483A}; /* page 24 0x6EEB-0x70E4 */ -static uint16 tab_uni_jisx021224[]={ +static const uint16 tab_uni_jisx021224[]={ 0x483B, 0,0x483C,0x483D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x483E, 0, 0x483F, 0,0x4840, 0, 0, 0, 0, 0, @@ -5595,7 +5595,7 @@ static uint16 tab_uni_jisx021224[]={ 0,0x4960}; /* page 25 0x70FA-0x71DC */ -static uint16 tab_uni_jisx021225[]={ +static const uint16 tab_uni_jisx021225[]={ 0x4961, 0, 0, 0, 0, 0, 0, 0, 0,0x4962,0x4963,0x4964,0x4965,0x4966, 0, 0, 0,0x4967,0x4968, 0, 0,0x4969, 0, 0, @@ -5627,7 +5627,7 @@ static uint16 tab_uni_jisx021225[]={ 0x4A3A, 0,0x4A3B}; /* page 26 0x71F8-0x7E9E */ -static uint16 tab_uni_jisx021226[]={ +static const uint16 tab_uni_jisx021226[]={ 0x4A3C, 0, 0, 0, 0, 0,0x4A3D, 0, 0x4A3E, 0, 0, 0, 0, 0, 0,0x4A3F, 0x4A40,0x4A41, 0, 0, 0, 0, 0, 0, @@ -6035,7 +6035,7 @@ static uint16 tab_uni_jisx021226[]={ 0x5467, 0,0x5468, 0, 0,0x5469,0x546A}; /* page 27 0x7F3B-0x8044 */ -static uint16 tab_uni_jisx021227[]={ +static const uint16 tab_uni_jisx021227[]={ 0x546C,0x546B,0x546D,0x546E,0x546F, 0, 0, 0, 0x5470,0x5471, 0, 0,0x5472, 0, 0, 0, 0, 0, 0, 0,0x5473, 0, 0,0x5474, @@ -6072,7 +6072,7 @@ static uint16 tab_uni_jisx021227[]={ 0,0x5563}; /* page 28 0x8060-0x8357 */ -static uint16 tab_uni_jisx021228[]={ +static const uint16 tab_uni_jisx021228[]={ 0x5564, 0, 0, 0,0x5565, 0,0x5566, 0, 0, 0, 0, 0, 0,0x5567, 0, 0, 0,0x5568, 0, 0, 0,0x5569, 0, 0, @@ -6171,7 +6171,7 @@ static uint16 tab_uni_jisx021228[]={ }; /* page 29 0x8370-0x8419 */ -static uint16 tab_uni_jisx021229[]={ +static const uint16 tab_uni_jisx021229[]={ 0x577D, 0, 0, 0, 0, 0, 0, 0, 0x577E, 0, 0, 0, 0,0x5821, 0,0x5822, 0x5823, 0,0x5824, 0,0x5825, 0,0x5826, 0, @@ -6196,7 +6196,7 @@ static uint16 tab_uni_jisx021229[]={ 0,0x584B}; /* page 30 0x842F-0x8880 */ -static uint16 tab_uni_jisx021230[]={ +static const uint16 tab_uni_jisx021230[]={ 0x584D, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x584E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x584F, 0, @@ -6338,7 +6338,7 @@ static uint16 tab_uni_jisx021230[]={ 0,0x5C38}; /* page 31 0x8898-0x89BC */ -static uint16 tab_uni_jisx021231[]={ +static const uint16 tab_uni_jisx021231[]={ 0x5C39, 0,0x5C3A,0x5C3B,0x5C3C, 0, 0,0x5C3D, 0x5C3E, 0, 0, 0, 0, 0, 0, 0, 0x5C3F, 0,0x5C40, 0, 0, 0, 0, 0, @@ -6378,7 +6378,7 @@ static uint16 tab_uni_jisx021231[]={ 0, 0, 0, 0,0x5D33}; /* page 32 0x89D4-0x8B9F */ -static uint16 tab_uni_jisx021232[]={ +static const uint16 tab_uni_jisx021232[]={ 0x5D34,0x5D35,0x5D36,0x5D37,0x5D38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x5D39, 0, 0, 0,0x5D3A, 0,0x5D3B, @@ -6439,7 +6439,7 @@ static uint16 tab_uni_jisx021232[]={ 0x5E5F, 0,0x5E60,0x5E61}; /* page 33 0x8C38-0x8CA4 */ -static uint16 tab_uni_jisx021233[]={ +static const uint16 tab_uni_jisx021233[]={ 0x5E62,0x5E63, 0, 0, 0,0x5E64,0x5E65, 0, 0, 0, 0, 0, 0,0x5E66, 0,0x5E67, 0,0x5E68, 0,0x5E69, 0, 0, 0,0x5E6A, @@ -6456,7 +6456,7 @@ static uint16 tab_uni_jisx021233[]={ 0, 0, 0, 0,0x5F29}; /* page 34 0x8CB9-0x8D1B */ -static uint16 tab_uni_jisx021234[]={ +static const uint16 tab_uni_jisx021234[]={ 0x5F2A,0x5F2B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x5F2C,0x5F2D, 0, 0, 0x5F2E, 0,0x5F2F, 0, 0, 0,0x5F30, 0, @@ -6472,7 +6472,7 @@ static uint16 tab_uni_jisx021234[]={ 0, 0,0x5F45}; /* page 35 0x8D65-0x8F65 */ -static uint16 tab_uni_jisx021235[]={ +static const uint16 tab_uni_jisx021235[]={ 0x5F46, 0, 0, 0,0x5F47, 0, 0,0x5F48, 0,0x5F49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6540,7 +6540,7 @@ static uint16 tab_uni_jisx021235[]={ 0x612C}; /* page 36 0x8F9D-0x9484 */ -static uint16 tab_uni_jisx021236[]={ +static const uint16 tab_uni_jisx021236[]={ 0x612D, 0, 0,0x612E,0x612F, 0, 0,0x6130, 0x6131,0x6132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6701,7 +6701,7 @@ static uint16 tab_uni_jisx021236[]={ }; /* page 37 0x9578-0x95E6 */ -static uint16 tab_uni_jisx021237[]={ +static const uint16 tab_uni_jisx021237[]={ 0x657D,0x657E, 0, 0, 0, 0,0x6621, 0, 0, 0, 0, 0,0x6622, 0, 0, 0, 0x6623, 0, 0, 0,0x6624,0x6625,0x6626, 0, @@ -6718,7 +6718,7 @@ static uint16 tab_uni_jisx021237[]={ 0x6641, 0, 0, 0,0x6642, 0,0x6643}; /* page 38 0x961D-0x986C */ -static uint16 tab_uni_jisx021238[]={ +static const uint16 tab_uni_jisx021238[]={ 0x6644,0x6645, 0, 0, 0,0x6646, 0,0x6647, 0x6648,0x6649, 0, 0, 0, 0, 0,0x664A, 0, 0, 0, 0,0x664B, 0,0x664C, 0, @@ -6796,7 +6796,7 @@ static uint16 tab_uni_jisx021238[]={ }; /* page 39 0x98AB-0x98CC */ -static uint16 tab_uni_jisx021239[]={ +static const uint16 tab_uni_jisx021239[]={ 0x683A, 0,0x683B,0x683C, 0,0x683D, 0, 0, 0,0x683E, 0, 0,0x683F,0x6840, 0,0x6841, 0x6842, 0, 0, 0,0x6843, 0, 0,0x6844, @@ -6804,7 +6804,7 @@ static uint16 tab_uni_jisx021239[]={ 0,0x6847}; /* page 40 0x98E1-0x9960 */ -static uint16 tab_uni_jisx021240[]={ +static const uint16 tab_uni_jisx021240[]={ 0x6848, 0,0x6849, 0,0x684A,0x684B,0x684C, 0, 0,0x684D, 0, 0, 0, 0, 0, 0, 0, 0,0x684E, 0, 0,0x684F, 0, 0, @@ -6824,7 +6824,7 @@ static uint16 tab_uni_jisx021240[]={ }; /* page 41 0x999B-0x9A5D */ -static uint16 tab_uni_jisx021241[]={ +static const uint16 tab_uni_jisx021241[]={ 0x6877, 0,0x6878, 0,0x6879, 0, 0, 0, 0, 0, 0,0x687A, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x687B,0x687C,0x687D, @@ -6852,7 +6852,7 @@ static uint16 tab_uni_jisx021241[]={ 0, 0,0x6955}; /* page 42 0x9AAA-0x9C7B */ -static uint16 tab_uni_jisx021242[]={ +static const uint16 tab_uni_jisx021242[]={ 0x6956, 0,0x6957, 0,0x6958,0x6959, 0, 0, 0x695A, 0,0x695B,0x695C,0x695D, 0, 0,0x695E, 0,0x695F, 0, 0,0x6960,0x6961, 0,0x6962, @@ -6914,7 +6914,7 @@ static uint16 tab_uni_jisx021242[]={ 0,0x6B58}; /* page 43 0x9CE6-0x9E1D */ -static uint16 tab_uni_jisx021243[]={ +static const uint16 tab_uni_jisx021243[]={ 0x6B59, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0x6B5A, 0, 0, 0, 0,0x6B5B, 0,0x6B5C, 0, 0, 0, 0, @@ -6957,7 +6957,7 @@ static uint16 tab_uni_jisx021243[]={ }; /* page 44 0x9E7A-0x9FA5 */ -static uint16 tab_uni_jisx021244[]={ +static const uint16 tab_uni_jisx021244[]={ 0x6C59,0x6C5A,0x6C5B, 0, 0, 0,0x6C5C, 0, 0x6C5D,0x6C5E,0x6C5F,0x6C60, 0,0x6C61, 0, 0, 0, 0, 0, 0,0x6C62,0x6C63, 0, 0, @@ -7094,34 +7094,34 @@ my_uni_jisx0212_onechar(int code){ /* page 0 0x222F-0x2244 */ -static uint16 tab_jisx0212_uni0[]={ +static const uint16 tab_jisx0212_uni0[]={ 0x02D8,0x02C7,0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA, 0x007E,0x0384,0x0385, 0, 0, 0, 0, 0, 0, 0, 0,0x00A1,0x00A6,0x00BF}; /* page 1 0x226B-0x2271 */ -static uint16 tab_jisx0212_uni1[]={ +static const uint16 tab_jisx0212_uni1[]={ 0x00BA,0x00AA,0x00A9,0x00AE,0x2122,0x00A4,0x2116}; /* page 2 0x2661-0x267C */ -static uint16 tab_jisx0212_uni2[]={ +static const uint16 tab_jisx0212_uni2[]={ 0x0386,0x0388,0x0389,0x038A,0x03AA, 0,0x038C, 0, 0x038E,0x03AB, 0,0x038F, 0, 0, 0, 0, 0x03AC,0x03AD,0x03AE,0x03AF,0x03CA,0x0390,0x03CC,0x03C2, 0x03CD,0x03CB,0x03B0,0x03CE}; /* page 3 0x2742-0x274E */ -static uint16 tab_jisx0212_uni3[]={ +static const uint16 tab_jisx0212_uni3[]={ 0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409, 0x040A,0x040B,0x040C,0x040E,0x040F}; /* page 4 0x2772-0x277E */ -static uint16 tab_jisx0212_uni4[]={ +static const uint16 tab_jisx0212_uni4[]={ 0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459, 0x045A,0x045B,0x045C,0x045E,0x045F}; /* page 5 0x2921-0x2950 */ -static uint16 tab_jisx0212_uni5[]={ +static const uint16 tab_jisx0212_uni5[]={ 0x00C6,0x0110, 0,0x0126, 0,0x0132, 0,0x0141, 0x013F, 0,0x014A,0x00D8,0x0152, 0,0x0166,0x00DE, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7131,7 +7131,7 @@ static uint16 tab_jisx0212_uni5[]={ }; /* page 6 0x2A21-0x2A77 */ -static uint16 tab_jisx0212_uni6[]={ +static const uint16 tab_jisx0212_uni6[]={ 0x00C1,0x00C0,0x00C4,0x00C2,0x0102,0x01CD,0x0100,0x0104, 0x00C5,0x00C3,0x0106,0x0108,0x010C,0x00C7,0x010A,0x010E, 0x00C9,0x00C8,0x00CB,0x00CA,0x011A,0x0116,0x0112,0x0118, @@ -7145,7 +7145,7 @@ static uint16 tab_jisx0212_uni6[]={ 0x0174,0x00DD,0x0178,0x0176,0x0179,0x017D,0x017B}; /* page 7 0x2B21-0x2B77 */ -static uint16 tab_jisx0212_uni7[]={ +static const uint16 tab_jisx0212_uni7[]={ 0x00E1,0x00E0,0x00E4,0x00E2,0x0103,0x01CE,0x0101,0x0105, 0x00E5,0x00E3,0x0107,0x0109,0x010D,0x00E7,0x010B,0x010F, 0x00E9,0x00E8,0x00EB,0x00EA,0x011B,0x0117,0x0113,0x0119, @@ -7159,7 +7159,7 @@ static uint16 tab_jisx0212_uni7[]={ 0x0175,0x00FD,0x00FF,0x0177,0x017A,0x017E,0x017C}; /* page 8 0x3021-0x307E */ -static uint16 tab_jisx0212_uni8[]={ +static const uint16 tab_jisx0212_uni8[]={ 0x4E02,0x4E04,0x4E05,0x4E0C,0x4E12,0x4E1F,0x4E23,0x4E24, 0x4E28,0x4E2B,0x4E2E,0x4E2F,0x4E30,0x4E35,0x4E40,0x4E41, 0x4E44,0x4E47,0x4E51,0x4E5A,0x4E5C,0x4E63,0x4E68,0x4E69, @@ -7174,7 +7174,7 @@ static uint16 tab_jisx0212_uni8[]={ 0x4F7A,0x4F7D,0x4F7E,0x4F81,0x4F82,0x4F84}; /* page 9 0x3121-0x317E */ -static uint16 tab_jisx0212_uni9[]={ +static const uint16 tab_jisx0212_uni9[]={ 0x4F85,0x4F89,0x4F8A,0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93, 0x4F94,0x4F97,0x4F99,0x4F9A,0x4F9E,0x4F9F,0x4FB2,0x4FB7, 0x4FB9,0x4FBB,0x4FBC,0x4FBD,0x4FBE,0x4FC0,0x4FC1,0x4FC5, @@ -7189,7 +7189,7 @@ static uint16 tab_jisx0212_uni9[]={ 0x5084,0x5086,0x508A,0x508E,0x508F,0x5090}; /* page 10 0x3221-0x327E */ -static uint16 tab_jisx0212_uni10[]={ +static const uint16 tab_jisx0212_uni10[]={ 0x5092,0x5093,0x5094,0x5096,0x509B,0x509C,0x509E,0x509F, 0x50A0,0x50A1,0x50A2,0x50AA,0x50AF,0x50B0,0x50B9,0x50BA, 0x50BD,0x50C0,0x50C3,0x50C4,0x50C7,0x50CC,0x50CE,0x50D0, @@ -7204,7 +7204,7 @@ static uint16 tab_jisx0212_uni10[]={ 0x51B8,0x51BA,0x51BC,0x51BE,0x51BF,0x51C2}; /* page 11 0x3321-0x337E */ -static uint16 tab_jisx0212_uni11[]={ +static const uint16 tab_jisx0212_uni11[]={ 0x51C8,0x51CF,0x51D1,0x51D2,0x51D3,0x51D5,0x51D8,0x51DE, 0x51E2,0x51E5,0x51EE,0x51F2,0x51F3,0x51F4,0x51F7,0x5201, 0x5202,0x5205,0x5212,0x5213,0x5215,0x5216,0x5218,0x5222, @@ -7219,7 +7219,7 @@ static uint16 tab_jisx0212_uni11[]={ 0x52F6,0x52F7,0x5300,0x5303,0x530A,0x530B}; /* page 12 0x3421-0x347E */ -static uint16 tab_jisx0212_uni12[]={ +static const uint16 tab_jisx0212_uni12[]={ 0x530C,0x5311,0x5313,0x5318,0x531B,0x531C,0x531E,0x531F, 0x5325,0x5327,0x5328,0x5329,0x532B,0x532C,0x532D,0x5330, 0x5332,0x5335,0x533C,0x533D,0x533E,0x5342,0x534C,0x534B, @@ -7234,7 +7234,7 @@ static uint16 tab_jisx0212_uni12[]={ 0x5469,0x546B,0x546D,0x546E,0x5474,0x547F}; /* page 13 0x3521-0x357E */ -static uint16 tab_jisx0212_uni13[]={ +static const uint16 tab_jisx0212_uni13[]={ 0x5481,0x5483,0x5485,0x5488,0x5489,0x548D,0x5491,0x5495, 0x5496,0x549C,0x549F,0x54A1,0x54A6,0x54A7,0x54A9,0x54AA, 0x54AD,0x54AE,0x54B1,0x54B7,0x54B9,0x54BA,0x54BB,0x54BF, @@ -7249,7 +7249,7 @@ static uint16 tab_jisx0212_uni13[]={ 0x55C9,0x55CB,0x55CC,0x55CE,0x55D1,0x55D2}; /* page 14 0x3621-0x367E */ -static uint16 tab_jisx0212_uni14[]={ +static const uint16 tab_jisx0212_uni14[]={ 0x55D3,0x55D7,0x55D8,0x55DB,0x55DE,0x55E2,0x55E9,0x55F6, 0x55FF,0x5605,0x5608,0x560A,0x560D,0x560E,0x560F,0x5610, 0x5611,0x5612,0x5619,0x562C,0x5630,0x5633,0x5635,0x5637, @@ -7264,7 +7264,7 @@ static uint16 tab_jisx0212_uni14[]={ 0x56E6,0x56E7,0x56E8,0x56F1,0x56EB,0x56ED}; /* page 15 0x3721-0x377E */ -static uint16 tab_jisx0212_uni15[]={ +static const uint16 tab_jisx0212_uni15[]={ 0x56F6,0x56F7,0x5701,0x5702,0x5707,0x570A,0x570C,0x5711, 0x5715,0x571A,0x571B,0x571D,0x5720,0x5722,0x5723,0x5724, 0x5725,0x5729,0x572A,0x572C,0x572E,0x572F,0x5733,0x5734, @@ -7279,7 +7279,7 @@ static uint16 tab_jisx0212_uni15[]={ 0x57FF,0x5803,0x5804,0x5808,0x5809,0x57E1}; /* page 16 0x3821-0x387E */ -static uint16 tab_jisx0212_uni16[]={ +static const uint16 tab_jisx0212_uni16[]={ 0x580C,0x580D,0x581B,0x581E,0x581F,0x5820,0x5826,0x5827, 0x582D,0x5832,0x5839,0x583F,0x5849,0x584C,0x584D,0x584F, 0x5850,0x5855,0x585F,0x5861,0x5864,0x5867,0x5868,0x5878, @@ -7294,7 +7294,7 @@ static uint16 tab_jisx0212_uni16[]={ 0x595E,0x595F,0x5961,0x5963,0x596B,0x596D}; /* page 17 0x3921-0x397E */ -static uint16 tab_jisx0212_uni17[]={ +static const uint16 tab_jisx0212_uni17[]={ 0x596F,0x5972,0x5975,0x5976,0x5979,0x597B,0x597C,0x598B, 0x598C,0x598E,0x5992,0x5995,0x5997,0x599F,0x59A4,0x59A7, 0x59AD,0x59AE,0x59AF,0x59B0,0x59B3,0x59B7,0x59BA,0x59BC, @@ -7309,7 +7309,7 @@ static uint16 tab_jisx0212_uni17[]={ 0x5AB3,0x5AB5,0x5AB8,0x5ABA,0x5ABB,0x5ABF}; /* page 18 0x3A21-0x3A7E */ -static uint16 tab_jisx0212_uni18[]={ +static const uint16 tab_jisx0212_uni18[]={ 0x5AC4,0x5AC6,0x5AC8,0x5ACF,0x5ADA,0x5ADC,0x5AE0,0x5AE5, 0x5AEA,0x5AEE,0x5AF5,0x5AF6,0x5AFD,0x5B00,0x5B01,0x5B08, 0x5B17,0x5B34,0x5B19,0x5B1B,0x5B1D,0x5B21,0x5B25,0x5B2D, @@ -7324,7 +7324,7 @@ static uint16 tab_jisx0212_uni18[]={ 0x5C5C,0x5C62,0x5C63,0x5C67,0x5C68,0x5C69}; /* page 19 0x3B21-0x3B7E */ -static uint16 tab_jisx0212_uni19[]={ +static const uint16 tab_jisx0212_uni19[]={ 0x5C6D,0x5C70,0x5C74,0x5C75,0x5C7A,0x5C7B,0x5C7C,0x5C7D, 0x5C87,0x5C88,0x5C8A,0x5C8F,0x5C92,0x5C9D,0x5C9F,0x5CA0, 0x5CA2,0x5CA3,0x5CA6,0x5CAA,0x5CB2,0x5CB4,0x5CB5,0x5CBA, @@ -7339,7 +7339,7 @@ static uint16 tab_jisx0212_uni19[]={ 0x5DD0,0x5DCE,0x5DD8,0x5DD9,0x5DE0,0x5DE4}; /* page 20 0x3C21-0x3C7E */ -static uint16 tab_jisx0212_uni20[]={ +static const uint16 tab_jisx0212_uni20[]={ 0x5DE9,0x5DF8,0x5DF9,0x5E00,0x5E07,0x5E0D,0x5E12,0x5E14, 0x5E15,0x5E18,0x5E1F,0x5E20,0x5E2E,0x5E28,0x5E32,0x5E35, 0x5E3E,0x5E4B,0x5E50,0x5E49,0x5E51,0x5E56,0x5E58,0x5E5B, @@ -7354,7 +7354,7 @@ static uint16 tab_jisx0212_uni20[]={ 0x5F58,0x5F5B,0x5F60,0x5F63,0x5F64,0x5F67}; /* page 21 0x3D21-0x3D7E */ -static uint16 tab_jisx0212_uni21[]={ +static const uint16 tab_jisx0212_uni21[]={ 0x5F6F,0x5F72,0x5F74,0x5F75,0x5F78,0x5F7A,0x5F7D,0x5F7E, 0x5F89,0x5F8D,0x5F8F,0x5F96,0x5F9C,0x5F9D,0x5FA2,0x5FA7, 0x5FAB,0x5FA4,0x5FAC,0x5FAF,0x5FB0,0x5FB1,0x5FB8,0x5FC4, @@ -7369,7 +7369,7 @@ static uint16 tab_jisx0212_uni21[]={ 0x60A4,0x60A5,0x60A8,0x60B0,0x60B1,0x60B7}; /* page 22 0x3E21-0x3E7E */ -static uint16 tab_jisx0212_uni22[]={ +static const uint16 tab_jisx0212_uni22[]={ 0x60BB,0x60BE,0x60C2,0x60C4,0x60C8,0x60C9,0x60CA,0x60CB, 0x60CE,0x60CF,0x60D4,0x60D5,0x60D9,0x60DB,0x60DD,0x60DE, 0x60E2,0x60E5,0x60F2,0x60F5,0x60F8,0x60FC,0x60FD,0x6102, @@ -7384,7 +7384,7 @@ static uint16 tab_jisx0212_uni22[]={ 0x61DF,0x61E1,0x61E2,0x61E7,0x61E9,0x61E5}; /* page 23 0x3F21-0x3F7E */ -static uint16 tab_jisx0212_uni23[]={ +static const uint16 tab_jisx0212_uni23[]={ 0x61EC,0x61ED,0x61EF,0x6201,0x6203,0x6204,0x6207,0x6213, 0x6215,0x621C,0x6220,0x6222,0x6223,0x6227,0x6229,0x622B, 0x6239,0x623D,0x6242,0x6243,0x6244,0x6246,0x624C,0x6250, @@ -7399,7 +7399,7 @@ static uint16 tab_jisx0212_uni23[]={ 0x6366,0x636C,0x636D,0x6371,0x6374,0x6375}; /* page 24 0x4021-0x407E */ -static uint16 tab_jisx0212_uni24[]={ +static const uint16 tab_jisx0212_uni24[]={ 0x6378,0x637C,0x637D,0x637F,0x6382,0x6384,0x6387,0x638A, 0x6390,0x6394,0x6395,0x6399,0x639A,0x639E,0x63A4,0x63A6, 0x63AD,0x63AE,0x63AF,0x63BD,0x63C1,0x63C5,0x63C8,0x63CE, @@ -7414,7 +7414,7 @@ static uint16 tab_jisx0212_uni24[]={ 0x64A8,0x64AC,0x64B3,0x64BD,0x64BE,0x64BF}; /* page 25 0x4121-0x417E */ -static uint16 tab_jisx0212_uni25[]={ +static const uint16 tab_jisx0212_uni25[]={ 0x64C4,0x64C9,0x64CA,0x64CB,0x64CC,0x64CE,0x64D0,0x64D1, 0x64D5,0x64D7,0x64E4,0x64E5,0x64E9,0x64EA,0x64ED,0x64F0, 0x64F5,0x64F7,0x64FB,0x64FF,0x6501,0x6504,0x6508,0x6509, @@ -7429,7 +7429,7 @@ static uint16 tab_jisx0212_uni25[]={ 0x660D,0x6611,0x6612,0x6615,0x6616,0x661D}; /* page 26 0x4221-0x427E */ -static uint16 tab_jisx0212_uni26[]={ +static const uint16 tab_jisx0212_uni26[]={ 0x661E,0x6621,0x6622,0x6623,0x6624,0x6626,0x6629,0x662A, 0x662B,0x662C,0x662E,0x6630,0x6631,0x6633,0x6639,0x6637, 0x6640,0x6645,0x6646,0x664A,0x664C,0x6651,0x664E,0x6657, @@ -7444,7 +7444,7 @@ static uint16 tab_jisx0212_uni26[]={ 0x6747,0x6748,0x674C,0x6754,0x6755,0x675D}; /* page 27 0x4321-0x437E */ -static uint16 tab_jisx0212_uni27[]={ +static const uint16 tab_jisx0212_uni27[]={ 0x6766,0x676C,0x676E,0x6774,0x6776,0x677B,0x6781,0x6784, 0x678E,0x678F,0x6791,0x6793,0x6796,0x6798,0x6799,0x679B, 0x67B0,0x67B1,0x67B2,0x67B5,0x67BB,0x67BC,0x67BD,0x67F9, @@ -7459,7 +7459,7 @@ static uint16 tab_jisx0212_uni27[]={ 0x68B2,0x68BB,0x68C5,0x68C8,0x68CC,0x68CF}; /* page 28 0x4421-0x447E */ -static uint16 tab_jisx0212_uni28[]={ +static const uint16 tab_jisx0212_uni28[]={ 0x68D0,0x68D1,0x68D3,0x68D6,0x68D9,0x68DC,0x68DD,0x68E5, 0x68E8,0x68EA,0x68EB,0x68EC,0x68ED,0x68F0,0x68F1,0x68F5, 0x68F6,0x68FB,0x68FC,0x68FD,0x6906,0x6909,0x690A,0x6910, @@ -7474,7 +7474,7 @@ static uint16 tab_jisx0212_uni28[]={ 0x6A1D,0x6A20,0x6A24,0x6A28,0x6A30,0x6A32}; /* page 29 0x4521-0x457E */ -static uint16 tab_jisx0212_uni29[]={ +static const uint16 tab_jisx0212_uni29[]={ 0x6A34,0x6A37,0x6A3B,0x6A3E,0x6A3F,0x6A45,0x6A46,0x6A49, 0x6A4A,0x6A4E,0x6A50,0x6A51,0x6A52,0x6A55,0x6A56,0x6A5B, 0x6A64,0x6A67,0x6A6A,0x6A71,0x6A73,0x6A7E,0x6A81,0x6A83, @@ -7489,7 +7489,7 @@ static uint16 tab_jisx0212_uni29[]={ 0x6B67,0x6B6B,0x6B6E,0x6B70,0x6B75,0x6B7D}; /* page 30 0x4621-0x467E */ -static uint16 tab_jisx0212_uni30[]={ +static const uint16 tab_jisx0212_uni30[]={ 0x6B7E,0x6B82,0x6B85,0x6B97,0x6B9B,0x6B9F,0x6BA0,0x6BA2, 0x6BA3,0x6BA8,0x6BA9,0x6BAC,0x6BAD,0x6BAE,0x6BB0,0x6BB8, 0x6BB9,0x6BBD,0x6BBE,0x6BC3,0x6BC4,0x6BC9,0x6BCC,0x6BD6, @@ -7504,7 +7504,7 @@ static uint16 tab_jisx0212_uni30[]={ 0x6CCF,0x6CD0,0x6CD1,0x6CD2,0x6CD4,0x6CD6}; /* page 31 0x4721-0x477E */ -static uint16 tab_jisx0212_uni31[]={ +static const uint16 tab_jisx0212_uni31[]={ 0x6CDA,0x6CDC,0x6CE0,0x6CE7,0x6CE9,0x6CEB,0x6CEC,0x6CEE, 0x6CF2,0x6CF4,0x6D04,0x6D07,0x6D0A,0x6D0E,0x6D0F,0x6D11, 0x6D13,0x6D1A,0x6D26,0x6D27,0x6D28,0x6C67,0x6D2E,0x6D2F, @@ -7519,7 +7519,7 @@ static uint16 tab_jisx0212_uni31[]={ 0x6E53,0x6E54,0x6E57,0x6E5C,0x6E5D,0x6E5E}; /* page 32 0x4821-0x487E */ -static uint16 tab_jisx0212_uni32[]={ +static const uint16 tab_jisx0212_uni32[]={ 0x6E62,0x6E63,0x6E68,0x6E73,0x6E7B,0x6E7D,0x6E8D,0x6E93, 0x6E99,0x6EA0,0x6EA7,0x6EAD,0x6EAE,0x6EB1,0x6EB3,0x6EBB, 0x6EBF,0x6EC0,0x6EC1,0x6EC3,0x6EC7,0x6EC8,0x6ECA,0x6ECD, @@ -7534,7 +7534,7 @@ static uint16 tab_jisx0212_uni32[]={ 0x6FB6,0x6FBC,0x6FC5,0x6FC7,0x6FC8,0x6FCA}; /* page 33 0x4921-0x497E */ -static uint16 tab_jisx0212_uni33[]={ +static const uint16 tab_jisx0212_uni33[]={ 0x6FDA,0x6FDE,0x6FE8,0x6FE9,0x6FF0,0x6FF5,0x6FF9,0x6FFC, 0x6FFD,0x7000,0x7005,0x7006,0x7007,0x700D,0x7017,0x7020, 0x7023,0x702F,0x7034,0x7037,0x7039,0x703C,0x7043,0x7044, @@ -7549,7 +7549,7 @@ static uint16 tab_jisx0212_uni33[]={ 0x7152,0x7157,0x715A,0x715C,0x715E,0x7160}; /* page 34 0x4A21-0x4A7E */ -static uint16 tab_jisx0212_uni34[]={ +static const uint16 tab_jisx0212_uni34[]={ 0x7168,0x7179,0x7180,0x7185,0x7187,0x718C,0x7192,0x719A, 0x719B,0x71A0,0x71A2,0x71AF,0x71B0,0x71B2,0x71B3,0x71BA, 0x71BF,0x71C0,0x71C1,0x71C4,0x71CB,0x71CC,0x71D3,0x71D6, @@ -7564,7 +7564,7 @@ static uint16 tab_jisx0212_uni34[]={ 0x72DF,0x72E5,0x72F3,0x72F4,0x72FA,0x72FB}; /* page 35 0x4B21-0x4B7E */ -static uint16 tab_jisx0212_uni35[]={ +static const uint16 tab_jisx0212_uni35[]={ 0x72FE,0x7302,0x7304,0x7305,0x7307,0x730B,0x730D,0x7312, 0x7313,0x7318,0x7319,0x731E,0x7322,0x7324,0x7327,0x7328, 0x732C,0x7331,0x7332,0x7335,0x733A,0x733B,0x733D,0x7343, @@ -7579,7 +7579,7 @@ static uint16 tab_jisx0212_uni35[]={ 0x73F5,0x73F7,0x73F9,0x73FA,0x73FB,0x73FD}; /* page 36 0x4C21-0x4C7E */ -static uint16 tab_jisx0212_uni36[]={ +static const uint16 tab_jisx0212_uni36[]={ 0x73FF,0x7400,0x7401,0x7404,0x7407,0x740A,0x7411,0x741A, 0x741B,0x7424,0x7426,0x7428,0x7429,0x742A,0x742B,0x742C, 0x742D,0x742E,0x742F,0x7430,0x7431,0x7439,0x7440,0x7443, @@ -7594,7 +7594,7 @@ static uint16 tab_jisx0212_uni36[]={ 0x74F4,0x74FA,0x74FB,0x74FC,0x74FF,0x7506}; /* page 37 0x4D21-0x4D7E */ -static uint16 tab_jisx0212_uni37[]={ +static const uint16 tab_jisx0212_uni37[]={ 0x7512,0x7516,0x7517,0x7520,0x7521,0x7524,0x7527,0x7529, 0x752A,0x752F,0x7536,0x7539,0x753D,0x753E,0x753F,0x7540, 0x7543,0x7547,0x7548,0x754E,0x7550,0x7552,0x7557,0x755E, @@ -7609,7 +7609,7 @@ static uint16 tab_jisx0212_uni37[]={ 0x762D,0x7632,0x7633,0x7635,0x7638,0x7639}; /* page 38 0x4E21-0x4E7E */ -static uint16 tab_jisx0212_uni38[]={ +static const uint16 tab_jisx0212_uni38[]={ 0x763A,0x763C,0x764A,0x7640,0x7641,0x7643,0x7644,0x7645, 0x7649,0x764B,0x7655,0x7659,0x765F,0x7664,0x7665,0x766D, 0x766E,0x766F,0x7671,0x7674,0x7681,0x7685,0x768C,0x768D, @@ -7624,7 +7624,7 @@ static uint16 tab_jisx0212_uni38[]={ 0x7757,0x775C,0x775E,0x775F,0x7760,0x7762}; /* page 39 0x4F21-0x4F7E */ -static uint16 tab_jisx0212_uni39[]={ +static const uint16 tab_jisx0212_uni39[]={ 0x7764,0x7767,0x776A,0x776C,0x7770,0x7772,0x7773,0x7774, 0x777A,0x777D,0x7780,0x7784,0x778C,0x778D,0x7794,0x7795, 0x7796,0x779A,0x779F,0x77A2,0x77A7,0x77AA,0x77AE,0x77AF, @@ -7639,7 +7639,7 @@ static uint16 tab_jisx0212_uni39[]={ 0x78AC,0x78AD,0x78B0,0x78B1,0x78B2,0x78B3}; /* page 40 0x5021-0x507E */ -static uint16 tab_jisx0212_uni40[]={ +static const uint16 tab_jisx0212_uni40[]={ 0x78BB,0x78BD,0x78BF,0x78C7,0x78C8,0x78C9,0x78CC,0x78CE, 0x78D2,0x78D3,0x78D5,0x78D6,0x78E4,0x78DB,0x78DF,0x78E0, 0x78E1,0x78E6,0x78EA,0x78F2,0x78F3,0x7900,0x78F6,0x78F7, @@ -7654,7 +7654,7 @@ static uint16 tab_jisx0212_uni40[]={ 0x79CF,0x79D4,0x79D6,0x79DA,0x79DD,0x79DE}; /* page 41 0x5121-0x517E */ -static uint16 tab_jisx0212_uni41[]={ +static const uint16 tab_jisx0212_uni41[]={ 0x79E0,0x79E2,0x79E5,0x79EA,0x79EB,0x79ED,0x79F1,0x79F8, 0x79FC,0x7A02,0x7A03,0x7A07,0x7A09,0x7A0A,0x7A0C,0x7A11, 0x7A15,0x7A1B,0x7A1E,0x7A21,0x7A27,0x7A2B,0x7A2D,0x7A2F, @@ -7669,7 +7669,7 @@ static uint16 tab_jisx0212_uni41[]={ 0x7B2A,0x7B2B,0x7B2D,0x7B2E,0x7B2F,0x7B30}; /* page 42 0x5221-0x527E */ -static uint16 tab_jisx0212_uni42[]={ +static const uint16 tab_jisx0212_uni42[]={ 0x7B31,0x7B34,0x7B3D,0x7B3F,0x7B40,0x7B41,0x7B47,0x7B4E, 0x7B55,0x7B60,0x7B64,0x7B66,0x7B69,0x7B6A,0x7B6D,0x7B6F, 0x7B72,0x7B73,0x7B77,0x7B84,0x7B89,0x7B8E,0x7B90,0x7B91, @@ -7684,7 +7684,7 @@ static uint16 tab_jisx0212_uni42[]={ 0x7C59,0x7C5A,0x7C5B,0x7C5C,0x7C5D,0x7C5E}; /* page 43 0x5321-0x537E */ -static uint16 tab_jisx0212_uni43[]={ +static const uint16 tab_jisx0212_uni43[]={ 0x7C61,0x7C63,0x7C67,0x7C69,0x7C6D,0x7C6E,0x7C70,0x7C72, 0x7C79,0x7C7C,0x7C7D,0x7C86,0x7C87,0x7C8F,0x7C94,0x7C9E, 0x7CA0,0x7CA6,0x7CB0,0x7CB6,0x7CB7,0x7CBA,0x7CBB,0x7CBC, @@ -7699,7 +7699,7 @@ static uint16 tab_jisx0212_uni43[]={ 0x7D8C,0x7D8D,0x7D91,0x7D96,0x7D97,0x7D9D}; /* page 44 0x5421-0x547E */ -static uint16 tab_jisx0212_uni44[]={ +static const uint16 tab_jisx0212_uni44[]={ 0x7D9E,0x7DA6,0x7DA7,0x7DAA,0x7DB3,0x7DB6,0x7DB7,0x7DB9, 0x7DC2,0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DCC,0x7DCD,0x7DCE, 0x7DD7,0x7DD9,0x7E00,0x7DE2,0x7DE5,0x7DE6,0x7DEA,0x7DEB, @@ -7714,7 +7714,7 @@ static uint16 tab_jisx0212_uni44[]={ 0x7F61,0x7F63,0x7F64,0x7F65,0x7F66,0x7F6D}; /* page 45 0x5521-0x557E */ -static uint16 tab_jisx0212_uni45[]={ +static const uint16 tab_jisx0212_uni45[]={ 0x7F71,0x7F7D,0x7F7E,0x7F7F,0x7F80,0x7F8B,0x7F8D,0x7F8F, 0x7F90,0x7F91,0x7F96,0x7F97,0x7F9C,0x7FA1,0x7FA2,0x7FA6, 0x7FAA,0x7FAD,0x7FB4,0x7FBC,0x7FBF,0x7FC0,0x7FC3,0x7FC8, @@ -7729,7 +7729,7 @@ static uint16 tab_jisx0212_uni45[]={ 0x80D5,0x80D7,0x80D8,0x80E0,0x80ED,0x80EE}; /* page 46 0x5621-0x567E */ -static uint16 tab_jisx0212_uni46[]={ +static const uint16 tab_jisx0212_uni46[]={ 0x80F0,0x80F2,0x80F3,0x80F6,0x80F9,0x80FA,0x80FE,0x8103, 0x810B,0x8116,0x8117,0x8118,0x811C,0x811E,0x8120,0x8124, 0x8127,0x812C,0x8130,0x8135,0x813A,0x813C,0x8145,0x8147, @@ -7744,7 +7744,7 @@ static uint16 tab_jisx0212_uni46[]={ 0x8234,0x823A,0x8243,0x8244,0x8245,0x8246}; /* page 47 0x5721-0x577E */ -static uint16 tab_jisx0212_uni47[]={ +static const uint16 tab_jisx0212_uni47[]={ 0x824B,0x824E,0x824F,0x8251,0x8256,0x825C,0x8260,0x8263, 0x8267,0x826D,0x8274,0x827B,0x827D,0x827F,0x8280,0x8281, 0x8283,0x8284,0x8287,0x8289,0x828A,0x828E,0x8291,0x8294, @@ -7759,7 +7759,7 @@ static uint16 tab_jisx0212_uni47[]={ 0x8351,0x8355,0x8356,0x8357,0x8370,0x8378}; /* page 48 0x5821-0x587E */ -static uint16 tab_jisx0212_uni48[]={ +static const uint16 tab_jisx0212_uni48[]={ 0x837D,0x837F,0x8380,0x8382,0x8384,0x8386,0x838D,0x8392, 0x8394,0x8395,0x8398,0x8399,0x839B,0x839C,0x839D,0x83A6, 0x83A7,0x83A9,0x83AC,0x83BE,0x83BF,0x83C0,0x83C7,0x83C9, @@ -7774,7 +7774,7 @@ static uint16 tab_jisx0212_uni48[]={ 0x84C2,0x84C7,0x84C8,0x84CC,0x84CF,0x84D3}; /* page 49 0x5921-0x597E */ -static uint16 tab_jisx0212_uni49[]={ +static const uint16 tab_jisx0212_uni49[]={ 0x84DC,0x84E7,0x84EA,0x84EF,0x84F0,0x84F1,0x84F2,0x84F7, 0x8532,0x84FA,0x84FB,0x84FD,0x8502,0x8503,0x8507,0x850C, 0x850E,0x8510,0x851C,0x851E,0x8522,0x8523,0x8524,0x8525, @@ -7789,7 +7789,7 @@ static uint16 tab_jisx0212_uni49[]={ 0x85E6,0x85E8,0x85ED,0x85F3,0x85F6,0x85FC}; /* page 50 0x5A21-0x5A7E */ -static uint16 tab_jisx0212_uni50[]={ +static const uint16 tab_jisx0212_uni50[]={ 0x85FF,0x8600,0x8604,0x8605,0x860D,0x860E,0x8610,0x8611, 0x8612,0x8618,0x8619,0x861B,0x861E,0x8621,0x8627,0x8629, 0x8636,0x8638,0x863A,0x863C,0x863D,0x8640,0x8642,0x8646, @@ -7804,7 +7804,7 @@ static uint16 tab_jisx0212_uni50[]={ 0x8714,0x8719,0x871E,0x871F,0x8721,0x8723}; /* page 51 0x5B21-0x5B7E */ -static uint16 tab_jisx0212_uni51[]={ +static const uint16 tab_jisx0212_uni51[]={ 0x8728,0x872E,0x872F,0x8731,0x8732,0x8739,0x873A,0x873C, 0x873D,0x873E,0x8740,0x8743,0x8745,0x874D,0x8758,0x875D, 0x8761,0x8764,0x8765,0x876F,0x8771,0x8772,0x877B,0x8783, @@ -7819,7 +7819,7 @@ static uint16 tab_jisx0212_uni51[]={ 0x8828,0x882D,0x882E,0x8830,0x8832,0x8835}; /* page 52 0x5C21-0x5C7E */ -static uint16 tab_jisx0212_uni52[]={ +static const uint16 tab_jisx0212_uni52[]={ 0x883A,0x883C,0x8841,0x8843,0x8845,0x8848,0x8849,0x884A, 0x884B,0x884E,0x8851,0x8855,0x8856,0x8858,0x885A,0x885C, 0x885F,0x8860,0x8864,0x8869,0x8871,0x8879,0x887B,0x8880, @@ -7834,7 +7834,7 @@ static uint16 tab_jisx0212_uni52[]={ 0x896B,0x896E,0x8970,0x8973,0x8975,0x897A}; /* page 53 0x5D21-0x5D7E */ -static uint16 tab_jisx0212_uni53[]={ +static const uint16 tab_jisx0212_uni53[]={ 0x897B,0x897C,0x897D,0x8989,0x898D,0x8990,0x8994,0x8995, 0x899B,0x899C,0x899F,0x89A0,0x89A5,0x89B0,0x89B4,0x89B5, 0x89B6,0x89B7,0x89BC,0x89D4,0x89D5,0x89D6,0x89D7,0x89D8, @@ -7849,7 +7849,7 @@ static uint16 tab_jisx0212_uni53[]={ 0x8A9F,0x8AA7,0x8AA9,0x8AAE,0x8AAF,0x8AB3}; /* page 54 0x5E21-0x5E7E */ -static uint16 tab_jisx0212_uni54[]={ +static const uint16 tab_jisx0212_uni54[]={ 0x8AB6,0x8AB7,0x8ABB,0x8ABE,0x8AC3,0x8AC6,0x8AC8,0x8AC9, 0x8ACA,0x8AD1,0x8AD3,0x8AD4,0x8AD5,0x8AD7,0x8ADD,0x8ADF, 0x8AEC,0x8AF0,0x8AF4,0x8AF5,0x8AF6,0x8AFC,0x8AFF,0x8B05, @@ -7864,7 +7864,7 @@ static uint16 tab_jisx0212_uni54[]={ 0x8C73,0x8C75,0x8C76,0x8C7B,0x8C7E,0x8C86}; /* page 55 0x5F21-0x5F7E */ -static uint16 tab_jisx0212_uni55[]={ +static const uint16 tab_jisx0212_uni55[]={ 0x8C87,0x8C8B,0x8C90,0x8C92,0x8C93,0x8C99,0x8C9B,0x8C9C, 0x8CA4,0x8CB9,0x8CBA,0x8CC5,0x8CC6,0x8CC9,0x8CCB,0x8CCF, 0x8CD6,0x8CD5,0x8CD9,0x8CDD,0x8CE1,0x8CE8,0x8CEC,0x8CEF, @@ -7879,7 +7879,7 @@ static uint16 tab_jisx0212_uni55[]={ 0x8E11,0x8E14,0x8E16,0x8E20,0x8E21,0x8E22}; /* page 56 0x6021-0x607E */ -static uint16 tab_jisx0212_uni56[]={ +static const uint16 tab_jisx0212_uni56[]={ 0x8E23,0x8E26,0x8E27,0x8E31,0x8E33,0x8E36,0x8E37,0x8E38, 0x8E39,0x8E3D,0x8E40,0x8E41,0x8E4B,0x8E4D,0x8E4E,0x8E4F, 0x8E54,0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E61,0x8E62,0x8E69, @@ -7894,7 +7894,7 @@ static uint16 tab_jisx0212_uni56[]={ 0x8F35,0x8F36,0x8F37,0x8F3A,0x8F40,0x8F41}; /* page 57 0x6121-0x617E */ -static uint16 tab_jisx0212_uni57[]={ +static const uint16 tab_jisx0212_uni57[]={ 0x8F43,0x8F47,0x8F4F,0x8F51,0x8F52,0x8F53,0x8F54,0x8F55, 0x8F58,0x8F5D,0x8F5E,0x8F65,0x8F9D,0x8FA0,0x8FA1,0x8FA4, 0x8FA5,0x8FA6,0x8FB5,0x8FB6,0x8FB8,0x8FBE,0x8FC0,0x8FC1, @@ -7909,7 +7909,7 @@ static uint16 tab_jisx0212_uni57[]={ 0x90B4,0x90B6,0x90BD,0x90CC,0x90BE,0x90C3}; /* page 58 0x6221-0x627E */ -static uint16 tab_jisx0212_uni58[]={ +static const uint16 tab_jisx0212_uni58[]={ 0x90C4,0x90C5,0x90C7,0x90C8,0x90D5,0x90D7,0x90D8,0x90D9, 0x90DC,0x90DD,0x90DF,0x90E5,0x90D2,0x90F6,0x90EB,0x90EF, 0x90F0,0x90F4,0x90FE,0x90FF,0x9100,0x9104,0x9105,0x9106, @@ -7924,7 +7924,7 @@ static uint16 tab_jisx0212_uni58[]={ 0x91B3,0x91B6,0x91BB,0x91BC,0x91BD,0x91BF}; /* page 59 0x6321-0x637E */ -static uint16 tab_jisx0212_uni59[]={ +static const uint16 tab_jisx0212_uni59[]={ 0x91C2,0x91C3,0x91C5,0x91D3,0x91D4,0x91D7,0x91D9,0x91DA, 0x91DE,0x91E4,0x91E5,0x91E9,0x91EA,0x91EC,0x91ED,0x91EE, 0x91EF,0x91F0,0x91F1,0x91F7,0x91F9,0x91FB,0x91FD,0x9200, @@ -7939,7 +7939,7 @@ static uint16 tab_jisx0212_uni59[]={ 0x9289,0x928A,0x928D,0x928E,0x9292,0x9297}; /* page 60 0x6421-0x647E */ -static uint16 tab_jisx0212_uni60[]={ +static const uint16 tab_jisx0212_uni60[]={ 0x9299,0x929F,0x92A0,0x92A4,0x92A5,0x92A7,0x92A8,0x92AB, 0x92AF,0x92B2,0x92B6,0x92B8,0x92BA,0x92BB,0x92BC,0x92BD, 0x92BF,0x92C0,0x92C1,0x92C2,0x92C3,0x92C5,0x92C6,0x92C7, @@ -7954,7 +7954,7 @@ static uint16 tab_jisx0212_uni60[]={ 0x936F,0x9370,0x9371,0x9373,0x9374,0x9376}; /* page 61 0x6521-0x657E */ -static uint16 tab_jisx0212_uni61[]={ +static const uint16 tab_jisx0212_uni61[]={ 0x937A,0x937D,0x937F,0x9380,0x9381,0x9382,0x9388,0x938A, 0x938B,0x938D,0x938F,0x9392,0x9395,0x9398,0x939B,0x939E, 0x93A1,0x93A3,0x93A4,0x93A6,0x93A8,0x93AB,0x93B4,0x93B5, @@ -7969,7 +7969,7 @@ static uint16 tab_jisx0212_uni61[]={ 0x9471,0x9472,0x9484,0x9483,0x9578,0x9579}; /* page 62 0x6621-0x667E */ -static uint16 tab_jisx0212_uni62[]={ +static const uint16 tab_jisx0212_uni62[]={ 0x957E,0x9584,0x9588,0x958C,0x958D,0x958E,0x959D,0x959E, 0x959F,0x95A1,0x95A6,0x95A9,0x95AB,0x95AC,0x95B4,0x95B6, 0x95BA,0x95BD,0x95BF,0x95C6,0x95C8,0x95C9,0x95CB,0x95D0, @@ -7984,7 +7984,7 @@ static uint16 tab_jisx0212_uni62[]={ 0x96DF,0x96E9,0x96EF,0x96F1,0x96FA,0x9702}; /* page 63 0x6721-0x677E */ -static uint16 tab_jisx0212_uni63[]={ +static const uint16 tab_jisx0212_uni63[]={ 0x9703,0x9705,0x9709,0x971A,0x971B,0x971D,0x9721,0x9722, 0x9723,0x9728,0x9731,0x9733,0x9741,0x9743,0x974A,0x974E, 0x974F,0x9755,0x9757,0x9758,0x975A,0x975B,0x9763,0x9767, @@ -7999,7 +7999,7 @@ static uint16 tab_jisx0212_uni63[]={ 0x9816,0x981C,0x981E,0x9820,0x9823,0x9826}; /* page 64 0x6821-0x687E */ -static uint16 tab_jisx0212_uni64[]={ +static const uint16 tab_jisx0212_uni64[]={ 0x982B,0x982E,0x982F,0x9830,0x9832,0x9833,0x9835,0x9825, 0x983E,0x9844,0x9847,0x984A,0x9851,0x9852,0x9853,0x9856, 0x9857,0x9859,0x985A,0x9862,0x9863,0x9865,0x9866,0x986A, @@ -8014,7 +8014,7 @@ static uint16 tab_jisx0212_uni64[]={ 0x999F,0x99A6,0x99B0,0x99B1,0x99B2,0x99B5}; /* page 65 0x6921-0x697E */ -static uint16 tab_jisx0212_uni65[]={ +static const uint16 tab_jisx0212_uni65[]={ 0x99B9,0x99BA,0x99BD,0x99BF,0x99C3,0x99C9,0x99D3,0x99D4, 0x99D9,0x99DA,0x99DC,0x99DE,0x99E7,0x99EA,0x99EB,0x99EC, 0x99F0,0x99F4,0x99F5,0x99F9,0x99FD,0x99FE,0x9A02,0x9A03, @@ -8029,7 +8029,7 @@ static uint16 tab_jisx0212_uni65[]={ 0x9AFD,0x9AFF,0x9B00,0x9B01,0x9B02,0x9B03}; /* page 66 0x6A21-0x6A7E */ -static uint16 tab_jisx0212_uni66[]={ +static const uint16 tab_jisx0212_uni66[]={ 0x9B04,0x9B05,0x9B08,0x9B09,0x9B0B,0x9B0C,0x9B0D,0x9B0E, 0x9B10,0x9B12,0x9B16,0x9B19,0x9B1B,0x9B1C,0x9B20,0x9B26, 0x9B2B,0x9B2D,0x9B33,0x9B34,0x9B35,0x9B37,0x9B39,0x9B3A, @@ -8044,7 +8044,7 @@ static uint16 tab_jisx0212_uni66[]={ 0x9BEA,0x9BEB,0x9BEF,0x9BF3,0x9BF7,0x9BF8}; /* page 67 0x6B21-0x6B7E */ -static uint16 tab_jisx0212_uni67[]={ +static const uint16 tab_jisx0212_uni67[]={ 0x9BF9,0x9BFA,0x9BFD,0x9BFF,0x9C00,0x9C02,0x9C0B,0x9C0F, 0x9C11,0x9C16,0x9C18,0x9C19,0x9C1A,0x9C1C,0x9C1E,0x9C22, 0x9C23,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,0x9C31,0x9C35, @@ -8059,7 +8059,7 @@ static uint16 tab_jisx0212_uni67[]={ 0x9D6A,0x9D6B,0x9D70,0x9D76,0x9D77,0x9D7B}; /* page 68 0x6C21-0x6C7E */ -static uint16 tab_jisx0212_uni68[]={ +static const uint16 tab_jisx0212_uni68[]={ 0x9D7C,0x9D7E,0x9D83,0x9D84,0x9D86,0x9D8A,0x9D8D,0x9D8E, 0x9D92,0x9D93,0x9D95,0x9D96,0x9D97,0x9D98,0x9DA1,0x9DAA, 0x9DAC,0x9DAE,0x9DB1,0x9DB5,0x9DB9,0x9DBC,0x9DBF,0x9DC3, @@ -8074,7 +8074,7 @@ static uint16 tab_jisx0212_uni68[]={ 0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,0x9EF5}; /* page 69 0x6D21-0x6D63 */ -static uint16 tab_jisx0212_uni69[]={ +static const uint16 tab_jisx0212_uni69[]={ 0x9EF8,0x9EFF,0x9F02,0x9F03,0x9F09,0x9F0F,0x9F10,0x9F11, 0x9F12,0x9F14,0x9F16,0x9F17,0x9F19,0x9F1A,0x9F1B,0x9F1F, 0x9F22,0x9F26,0x9F2A,0x9F2B,0x9F2F,0x9F31,0x9F32,0x9F34, @@ -8542,7 +8542,7 @@ static MY_CHARSET_HANDLER my_charset_handler= -CHARSET_INFO my_charset_ujis_japanese_ci= +struct charset_info_st my_charset_ujis_japanese_ci= { 12,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ @@ -8575,7 +8575,7 @@ CHARSET_INFO my_charset_ujis_japanese_ci= }; -CHARSET_INFO my_charset_ujis_bin= +struct charset_info_st my_charset_ujis_bin= { 91,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT, /* state */ diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 91f633e45ce..7ddb852fa79 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1486,7 +1486,7 @@ static MY_UNICASE_INFO planeFF[]={ {0xFFFE,0xFFFE,0xFFFE}, {0xFFFF,0xFFFF,0xFFFF} }; -MY_UNICASE_INFO *my_unicase_default[256]={ +MY_UNICASE_INFO *const my_unicase_default[256]={ plane00, plane01, plane02, plane03, plane04, plane05, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -1665,7 +1665,7 @@ static MY_UNICASE_INFO turk00[]= -MY_UNICASE_INFO *my_unicase_turkish[256]= +MY_UNICASE_INFO *const my_unicase_turkish[256]= { turk00, plane01, plane02, plane03, plane04, plane05, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -1716,14 +1716,12 @@ int my_wildcmp_unicode(CHARSET_INFO *cs, const char *str,const char *str_end, const char *wildstr,const char *wildend, int escape, int w_one, int w_many, - MY_UNICASE_INFO **weights) + MY_UNICASE_INFO *const *weights) { int result= -1; /* Not found, using wildcards */ my_wc_t s_wc, w_wc; int scan, plane; - int (*mb_wc)(struct charset_info_st *, my_wc_t *, - const uchar *, const uchar *); - mb_wc= cs->cset->mb_wc; + my_charset_conv_mb_wc mb_wc= cs->cset->mb_wc; while (wildstr != wildend) { @@ -1873,7 +1871,7 @@ int my_wildcmp_unicode(CHARSET_INFO *cs, expressions. Note, there is no need to mark byte 255 as a letter, it is illegal byte in UTF8. */ -static uchar ctype_utf8[] = { +static const uchar ctype_utf8[] = { 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, @@ -1895,7 +1893,7 @@ static uchar ctype_utf8[] = { /* The below are taken from usa7 implementation */ -static uchar to_lower_utf8[] = { +static const uchar to_lower_utf8[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -1914,7 +1912,7 @@ static uchar to_lower_utf8[] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static uchar to_upper_utf8[] = { +static const uchar to_upper_utf8[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -2174,7 +2172,7 @@ static size_t my_caseup_utf8(CHARSET_INFO *cs, char *src, size_t srclen, my_wc_t wc; int srcres, dstres; char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; DBUG_ASSERT(src != dst || cs->caseup_multiply == 1); while ((src < srcend) && @@ -2197,7 +2195,7 @@ static void my_hash_sort_utf8(CHARSET_INFO *cs, const uchar *s, size_t slen, my_wc_t wc; int res; const uchar *e=s+slen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; /* Remove end space. We have to do this to be able to compare @@ -2224,7 +2222,7 @@ static size_t my_caseup_str_utf8(CHARSET_INFO *cs, char *src) my_wc_t wc; int srcres, dstres; char *dst= src, *dst0= src; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; DBUG_ASSERT(cs->caseup_multiply == 1); while (*src && @@ -2248,7 +2246,7 @@ static size_t my_casedn_utf8(CHARSET_INFO *cs, char *src, size_t srclen, my_wc_t wc; int srcres, dstres; char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; DBUG_ASSERT(src != dst || cs->casedn_multiply == 1); while ((src < srcend) && @@ -2270,7 +2268,7 @@ static size_t my_casedn_str_utf8(CHARSET_INFO *cs, char *src) my_wc_t wc; int srcres, dstres; char *dst= src, *dst0= src; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; DBUG_ASSERT(cs->casedn_multiply == 1); while (*src && @@ -2313,7 +2311,7 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs, my_wc_t UNINIT_VAR(s_wc), t_wc; const uchar *se=s+slen; const uchar *te=t+tlen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while ( s < se && t < te ) { @@ -2382,7 +2380,7 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs, int s_res, t_res, res; my_wc_t UNINIT_VAR(s_wc),t_wc; const uchar *se= s+slen, *te= t+tlen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE diff_if_only_endspace_difference= 0; @@ -2470,7 +2468,7 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs, static int my_strcasecmp_utf8(CHARSET_INFO *cs, const char *s, const char *t) { - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while (s[0] && t[0]) { my_wc_t s_wc,t_wc; @@ -2555,7 +2553,7 @@ int my_wildcmp_utf8(CHARSET_INFO *cs, const char *wildstr,const char *wildend, int escape, int w_one, int w_many) { - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; return my_wildcmp_unicode(cs,str,str_end,wildstr,wildend, escape,w_one,w_many,uni_plane); } @@ -2579,7 +2577,7 @@ static size_t my_strnxfrm_utf8(CHARSET_INFO *cs, uchar *de= dst + dstlen; uchar *de_beg= de - 1; const uchar *se = src + srclen; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while (dst < de_beg) { @@ -2685,7 +2683,7 @@ MY_CHARSET_HANDLER my_charset_utf8_handler= -CHARSET_INFO my_charset_utf8_general_ci= +struct charset_info_st my_charset_utf8_general_ci= { 33,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE, /* state */ @@ -2718,7 +2716,7 @@ CHARSET_INFO my_charset_utf8_general_ci= }; -CHARSET_INFO my_charset_utf8_bin= +struct charset_info_st my_charset_utf8_bin= { 83,0,0, /* number */ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE, /* state */ @@ -2770,7 +2768,7 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs, const uchar *te=t+tlen; int save_diff = 0; int diff; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; while ( s < se && t < te ) { @@ -2815,7 +2813,7 @@ static int my_strnncollsp_utf8_cs(CHARSET_INFO *cs, const uchar *se= s + slen; const uchar *te= t + tlen; int save_diff= 0; - MY_UNICASE_INFO **uni_plane= cs->caseinfo; + MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE diff_if_only_endspace_difference= 0; @@ -2901,7 +2899,7 @@ static MY_COLLATION_HANDLER my_collation_cs_handler = my_propagate_simple }; -CHARSET_INFO my_charset_utf8_general_cs= +struct charset_info_st my_charset_utf8_general_cs= { 254,0,0, /* number */ MY_CS_COMPILED|MY_CS_UNICODE, /* state */ @@ -2959,7 +2957,7 @@ All other characters are encoded using five bytes: */ -static uint16 touni[5994]= +static const uint16 touni[5994]= { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -3715,7 +3713,7 @@ static uint16 touni[5994]= /* 00C0-05FF */ -static uint16 uni_0C00_05FF[1344]= +static const uint16 uni_0C00_05FF[1344]= { 0x0017,0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E, 0x001F,0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026, @@ -3959,7 +3957,7 @@ static uint16 uni_1E00_1FFF[512]= /* 2160-217F */ -static uint16 uni_2160_217F[32]= +static const uint16 uni_2160_217F[32]= { 0x0739,0x0789,0x07D9,0x0829,0x0879,0x08C9,0x0919,0x0969, 0x09B9,0x0A09,0x0A59,0x0AA9,0x0AF9,0x0B49,0x0B99,0x0BE9, @@ -3969,7 +3967,7 @@ static uint16 uni_2160_217F[32]= /* 24B0-24EF */ -static uint16 uni_24B0_24EF[64]= +static const uint16 uni_24B0_24EF[64]= { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0511,0x0512, 0x0513,0x0514,0x0515,0x0516,0x0517,0x0518,0x0519,0x051A, @@ -3983,7 +3981,7 @@ static uint16 uni_24B0_24EF[64]= /* FF20-FF5F */ -static uint16 uni_FF20_FF5F[64]= +static const uint16 uni_FF20_FF5F[64]= { 0x0000,0x0560,0x05B0,0x0600,0x0650,0x06A0,0x06F0,0x0740, 0x0790,0x07E0,0x0830,0x0880,0x08D0,0x0920,0x0970,0x09C0, @@ -4007,7 +4005,7 @@ static uint16 uni_FF20_FF5F[64]= static int hexlo(int x) { - static char hex_lo_digit[256]= + static const char hex_lo_digit[256]= { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* ................ */ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* ................ */ @@ -4038,7 +4036,7 @@ static int hexlo(int x) 0..9 digits _ underscore */ -static char filename_safe_char[128]= +static const char filename_safe_char[128]= { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ................ */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ................ */ @@ -4197,7 +4195,7 @@ static MY_CHARSET_HANDLER my_charset_filename_handler= -CHARSET_INFO my_charset_filename= +struct charset_info_st my_charset_filename= { 17,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_HIDDEN|MY_CS_NONASCII, diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c index b22b4364e8a..abef74dd6eb 100644 --- a/strings/ctype-win1250ch.c +++ b/strings/ctype-win1250ch.c @@ -53,7 +53,7 @@ #ifdef HAVE_CHARSET_cp1250 -static uint16 tab_cp1250_uni[256]={ +static const uint16 tab_cp1250_uni[256]={ 0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, 0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017, @@ -90,7 +90,7 @@ static uint16 tab_cp1250_uni[256]={ /* 0000-00FD , 254 chars */ -static uchar tab_uni_cp1250_plane00[]={ +static const uchar tab_uni_cp1250_plane00[]={ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F, @@ -109,7 +109,7 @@ static uchar tab_uni_cp1250_plane00[]={ 0x00,0x00,0x00,0xF3,0xF4,0x00,0xF6,0xF7,0x00,0x00,0xFA,0x00,0xFC,0xFD}; /* 0102-017E , 125 chars */ -static uchar tab_uni_cp1250_plane01[]={ +static const uchar tab_uni_cp1250_plane01[]={ 0xC3,0xE3,0xA5,0xB9,0xC6,0xE6,0x00,0x00,0x00,0x00,0xC8,0xE8,0xCF,0xEF,0xD0,0xF0, 0x00,0x00,0x00,0x00,0x00,0x00,0xCA,0xEA,0xCC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -120,7 +120,7 @@ static uchar tab_uni_cp1250_plane01[]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x9F,0xAF,0xBF,0x8E,0x9E}; /* 2013-20AC , 154 chars */ -static uchar tab_uni_cp1250_plane20[]={ +static const uchar tab_uni_cp1250_plane20[]={ 0x96,0x97,0x00,0x00,0x00,0x91,0x92,0x82,0x00,0x93,0x94,0x84,0x00,0x86,0x87,0x95, 0x00,0x00,0x00,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x89,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x8B,0x9B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -133,12 +133,12 @@ static uchar tab_uni_cp1250_plane20[]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80}; /* 02C7-02DD , 23 chars */ -static uchar tab_uni_cp1250_plane02[]={ +static const uchar tab_uni_cp1250_plane02[]={ 0xA1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0xA2,0xFF,0x00,0xB2,0x00,0xBD}; /* 2122-2122 , 1 chars */ -static uchar tab_uni_cp1250_plane21[]={ +static const uchar tab_uni_cp1250_plane21[]={ 0x99}; @@ -152,7 +152,7 @@ static MY_UNI_IDX idx_uni_cp1250[]={ }; -static uchar NEAR ctype_win1250ch[] = { +static const uchar NEAR ctype_win1250ch[] = { 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x28, 0x28, 0x28, 0x28, 0x28, 0x20, 0x20, @@ -188,7 +188,7 @@ static uchar NEAR ctype_win1250ch[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x10 }; -static uchar NEAR to_lower_win1250ch[] = { +static const uchar NEAR to_lower_win1250ch[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, @@ -223,7 +223,7 @@ static uchar NEAR to_lower_win1250ch[] = { 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }; -static uchar NEAR to_upper_win1250ch[] = { +static const uchar NEAR to_upper_win1250ch[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, @@ -260,7 +260,7 @@ static uchar NEAR to_upper_win1250ch[] = { -static uchar NEAR sort_order_win1250ch[] = { +static const uchar NEAR sort_order_win1250ch[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -279,7 +279,7 @@ static uchar NEAR sort_order_win1250ch[] = { 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 }; -static uchar NEAR _sort_order_win1250ch1[] = { +static const uchar NEAR _sort_order_win1250ch1[] = { 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, @@ -404,7 +404,7 @@ struct wordvalue { uchar pass1; uchar pass2; }; -static struct wordvalue doubles[] = { +static const struct wordvalue doubles[] = { { (uchar*) "ch", 0xad, 0x03 }, { (uchar*) "c", 0xa6, 0x02 }, { (uchar*) "Ch", 0xad, 0x02 }, @@ -513,7 +513,7 @@ static size_t my_strnxfrm_win1250ch(CHARSET_INFO * cs __attribute__((unused)), #ifdef REAL_MYSQL -static uchar NEAR like_range_prefix_min_win1250ch[]= +static const uchar NEAR like_range_prefix_min_win1250ch[]= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, @@ -677,7 +677,7 @@ static MY_COLLATION_HANDLER my_collation_czech_ci_handler = }; -CHARSET_INFO my_charset_cp1250_czech_ci = +struct charset_info_st my_charset_cp1250_czech_ci = { 34,0,0, /* number */ MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_CSSORT, /* state */ diff --git a/strings/ctype.c b/strings/ctype.c index 75d76aceea3..51e97b9eb48 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -76,7 +76,7 @@ struct my_cs_file_section_st #define _CS_DIFF3 21 -static struct my_cs_file_section_st sec[] = +static const struct my_cs_file_section_st sec[] = { {_CS_MISC, "xml"}, {_CS_MISC, "xml/version"}, @@ -111,9 +111,10 @@ static struct my_cs_file_section_st sec[] = {0, NULL} }; -static struct my_cs_file_section_st * cs_file_sec(const char *attr, size_t len) +static const struct my_cs_file_section_st +*cs_file_sec(const char *attr, size_t len) { - struct my_cs_file_section_st *s; + const struct my_cs_file_section_st *s; for (s=sec; s->str; s++) { if (!strncmp(attr,s->str,len)) @@ -137,8 +138,8 @@ typedef struct my_cs_file_info char comment[MY_CS_CSDESCR_SIZE]; char tailoring[MY_CS_TAILORING_SIZE]; size_t tailoring_length; - CHARSET_INFO cs; - int (*add_collation)(CHARSET_INFO *cs); + struct charset_info_st cs; + int (*add_collation)(struct charset_info_st *cs); } MY_CHARSET_LOADER; @@ -181,7 +182,7 @@ static int fill_uint16(uint16 *a,uint size,const char *str, size_t len) static int cs_enter(MY_XML_PARSER *st,const char *attr, size_t len) { struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data; - struct my_cs_file_section_st *s= cs_file_sec(attr,len); + const struct my_cs_file_section_st *s= cs_file_sec(attr,len); if ( s && (s->state == _CS_CHARSET)) bzero(&i->cs,sizeof(i->cs)); @@ -196,7 +197,7 @@ static int cs_enter(MY_XML_PARSER *st,const char *attr, size_t len) static int cs_leave(MY_XML_PARSER *st,const char *attr, size_t len) { struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data; - struct my_cs_file_section_st *s= cs_file_sec(attr,len); + const struct my_cs_file_section_st *s= cs_file_sec(attr,len); int state= s ? s->state : 0; int rc; @@ -214,9 +215,9 @@ static int cs_leave(MY_XML_PARSER *st,const char *attr, size_t len) static int cs_value(MY_XML_PARSER *st,const char *attr, size_t len) { struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data; - struct my_cs_file_section_st *s; - int state= (int)((s=cs_file_sec(st->attr, strlen(st->attr))) ? s->state : - 0); + const struct my_cs_file_section_st *s; + int state= (int)((s= cs_file_sec(st->attr, strlen(st->attr))) ? s->state : + 0); switch (state) { case _CS_ID: @@ -291,7 +292,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, size_t len) my_bool my_parse_charset_xml(const char *buf, size_t len, - int (*add_collation)(CHARSET_INFO *cs)) + int (*add_collation)(struct charset_info_st *cs)) { MY_XML_PARSER p; struct my_cs_file_info i; diff --git a/strings/int2str.c b/strings/int2str.c index fba98aac3f1..411762c38d3 100644 --- a/strings/int2str.c +++ b/strings/int2str.c @@ -19,9 +19,9 @@ /* _dig_vec arrays are public because they are used in several outer places. */ -char NEAR _dig_vec_upper[] = +const char NEAR _dig_vec_upper[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -char NEAR _dig_vec_lower[] = +const char NEAR _dig_vec_lower[] = "0123456789abcdefghijklmnopqrstuvwxyz"; @@ -56,7 +56,7 @@ int2str(register long int val, register char *dst, register int radix, char buffer[65]; register char *p; long int new_val; - char *dig_vec= upcase ? _dig_vec_upper : _dig_vec_lower; + const char *dig_vec= upcase ? _dig_vec_upper : _dig_vec_lower; ulong uval= (ulong) val; if (radix < 0) |