--- rxvt-unicode/src/table/jis0212_1990_0.h 2004/07/26 18:01:19 1.4 +++ rxvt-unicode/src/table/jis0212_1990_0.h 2004/08/04 03:29:29 1.6 @@ -2115,25 +2115,24 @@ }; -struct rxvt_codeset_conv_jis0212_1990_0 : rxvt_codeset_conv { - uint32_t from_unicode (unicode_t unicode) const { +static uint32_t cs_jis0212_1990_0_from_unicode (unicode_t unicode) { if (unicode == 0x007e) return 0x2237; if (unicode == 0x2116) return 0x2271; if (unicode == 0x2122) return 0x226f; uint8_t l = unicode; uint16_t h = unicode >> 8; - if (h <= 0x9f - && l <= 0xff + if (0x00 <= h && h <= 0x9f + && 0x00 <= l && l <= 0xff && jis0212_1990_0_f_i[h - 0x00]) return jis0212_1990_0_f_i[h - 0x00][l - 0x00] ? jis0212_1990_0_f_i[h - 0x00][l - 0x00] : NOCHAR; return NOCHAR; - } -} rxvt_codeset_conv_jis0212_1990_0; +} #else -#define rxvt_codeset_conv_jis0212_1990_0 rxvt_codeset_conv_unknown +#define cs_jis0212_1990_0_from_unicode cs_unknown_from_unicode +#define cs_jis0212_1990_0_to_unicode cs_unknown_to_unicode #endif