X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.def;h=3d0e89e4466f8955461e0bf2753c6d3769f99a9a;hp=fc6abba56e965b3239f686317f2f5145c4502637;hb=refs%2Fheads%2Ftry-some-d;hpb=2c3617ad2d8a2ad98b573cc34483d1cb7cd451f5

diff --git a/charset.def b/charset.def
index fc6abba..3d0e89e 100644
--- a/charset.def
+++ b/charset.def
@@ -1,4 +1,4 @@
-cat <<EOF | gperf -Nmutt_canonical_charset_aux -m16 -l -t -C -F", NULL"
+cat <<EOF | gperf -Ncharset_canonicalize_aux -m16 -l -E -t -C -F", NULL" | sed -e '/__gnu_inline__/d;s/\<\(__\|\)inline\>//g'
 %{
 /*
  *  This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,9 @@ cat <<EOF | gperf -Nmutt_canonical_charset_aux -m16 -l -t -C -F", NULL"
  * encoding name, hence you have to pass a charset stripped from its '-' and
  * '_' and truncated at the first ':' encountered.
  */
+
+static const struct cset_pair *
+charset_canonicalize_aux(const char *str, unsigned int len);
 %}
 struct cset_pair { const char *name; const char *pref; };
 %%
@@ -124,6 +127,7 @@ mskanji, "shift_jis"
 pck, "shift_jis"
 sjis, "shift_jis"
 us, "us-ascii"
+utf8, "utf-8"
 zhtwbig5, "big5"
 646, "us-ascii"
 %%