--- rxvt-unicode/src/table/jis0208_1990_0.h 2004/07/29 23:18:06 1.3 +++ rxvt-unicode/src/table/jis0208_1990_0.h 2004/08/04 03:29:29 1.4 @@ -2239,22 +2239,22 @@ }; -struct rxvt_codeset_conv_jis0208_1990_0 : rxvt_codeset_conv { - uint32_t from_unicode (unicode_t unicode) const { +static uint32_t cs_jis0208_1990_0_from_unicode (unicode_t unicode) { if (unicode == 0x2312) return 0x225e; uint8_t l = unicode; uint16_t h = unicode >> 8; - if (h <= 0xff + if (0x00 <= h && h <= 0xff + && 0x00 <= l && l <= 0xff && jis0208_1990_0_f_i[h - 0x00]) return jis0208_1990_0_f_i[h - 0x00][l - 0x00] ? jis0208_1990_0_f_i[h - 0x00][l - 0x00] : NOCHAR; return NOCHAR; - } -} rxvt_codeset_conv_jis0208_1990_0; +} #else -#define rxvt_codeset_conv_jis0208_1990_0 rxvt_codeset_conv_unknown +#define cs_jis0208_1990_0_from_unicode cs_unknown_from_unicode +#define cs_jis0208_1990_0_to_unicode cs_unknown_to_unicode #endif