At last, merge the putty-gtk2 branch back into the trunk!

[u/mdw/putty] / charset / charset.h

diff --git a/charset/charset.h b/charset/charset.h
index 7dd038b..5f83edd 100644 (file)
--- a/charset/charset.h
+++ b/charset/charset.h
@@ -32,6 +32,7 @@ typedef enum {
     CS_ISO8859_16,
     CS_CP437,
     CS_CP850,
+    CS_CP866,
     CS_CP1250,
     CS_CP1251,
     CS_CP1252,
@@ -137,6 +138,14 @@ const char *charset_to_mimeenc(int charset);
 int charset_from_mimeenc(const char *name);
 
 /*
+ * Convert our own encoding names to and from our charset
+ * identifiers.
+ */
+const char *charset_to_localenc(int charset);
+int charset_from_localenc(const char *name);
+int charset_localenc_nth(int n);
+
+/*
  * Convert Mac OS script/region/font to our charset identifiers.
  */
 int charset_from_macenc(int script, int region, int sysvers,