--- rxvt-unicode/src/table/iso8859_16.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/table/iso8859_16.h	2004/08/04 03:29:29	1.4
@@ -21,19 +21,8 @@
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xf8,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0xac, 0xae, 0xaf, 0xbf, 0xb4, 0xb8
 };
-static const uint16_t iso8859_16_t_0[] = {
-  0x00a0, 0x0104, 0x0105, 0x0141, 0x20ac, 0x201e, 0x0160, 0x00a7, 0x0161, 0x00a9, 0x0218, 0x00ab,
-  0x0179, 0x00ad, 0x017a, 0x017b, 0x00b0, 0x00b1, 0x010c, 0x0142, 0x017d, 0x201d, 0x00b6, 0x00b7,
-  0x017e, 0x010d, 0x0219, 0x00bb, 0x0152, 0x0153, 0x0178, 0x017c, 0x00c0, 0x00c1, 0x00c2, 0x0102,
-  0x00c4, 0x0106, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-  0x0110, 0x0143, 0x00d2, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x015a, 0x0170, 0x00d9, 0x00da, 0x00db,
-  0x00dc, 0x0118, 0x021a, 0x00df, 0x00e0, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x0107, 0x00e6, 0x00e7,
-  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 0x0111, 0x0144, 0x00f2, 0x00f3,
-  0x00f4, 0x0151, 0x00f6, 0x015b, 0x0171, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0119, 0x021b, 0x00ff
-};
 
-struct rxvt_codeset_conv_iso8859_16 : rxvt_codeset_conv {
-  uint32_t from_unicode (uint32_t unicode) const {
+static uint32_t cs_iso8859_16_from_unicode (unicode_t unicode) {
     if (unicode <= 0x009f) return unicode;
     if (unicode == 0x0218) return 0x00aa;
     if (unicode == 0x0219) return 0x00ba;
@@ -47,17 +36,11 @@
     if (0x0102 <= unicode && unicode <= 0x017e)
       return iso8859_16_f_256[unicode - 0x0102] == 0 ? NOCHAR : iso8859_16_f_256[unicode - 0x0102];
     return NOCHAR;
-  }
-  uint32_t to_unicode (uint32_t enc) const {
-    if (enc <= 0x009f) return enc;
-    if (0x00a0 <= enc && enc <= 0x00ff)
-      return iso8859_16_t_0[enc - 0x00a0];
-    return NOCHAR;
-  }
-} rxvt_codeset_conv_iso8859_16;
+}
 
 #else
 
-#define rxvt_codeset_conv_iso8859_16 rxvt_codeset_conv_unknown
+#define cs_iso8859_16_from_unicode cs_unknown_from_unicode
+#define cs_iso8859_16_to_unicode   cs_unknown_to_unicode
 
 #endif