From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 14 Feb 2002 11:22:51 +0000 (+0000)
Subject: Iconv patch from Lars Hecking.  MAY NEED TO BE BACKPORTED.
X-Git-Tag: mutt-1-5-1-rel~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3364b9c58d06af59c2cdbedd04fd643714cdfd52;p=mutt

Iconv patch from Lars Hecking.  MAY NEED TO BE BACKPORTED.
---

diff --git a/charset.c b/charset.c
index 4b9272ea..b347773e 100644
--- a/charset.c
+++ b/charset.c
@@ -31,8 +31,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <iconv.h>
-
 #include "mutt.h"
 #include "charset.h"
 
diff --git a/gnupgparse.c b/gnupgparse.c
index 8b7bf4c3..bf0e2e60 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -44,7 +44,6 @@
 #include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
-#include "iconv.h"
 
 /* for hexval */
 #include "mime.h"
diff --git a/init.h b/init.h
index e4f85605..fa1f6513 100644
--- a/init.h
+++ b/init.h
@@ -2637,7 +2637,9 @@ struct command_t Commands[] = {
   { "fcc-save-hook",	mutt_parse_hook,	M_FCCHOOK | M_SAVEHOOK },
   { "folder-hook",	mutt_parse_hook,	M_FOLDERHOOK },
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
+#ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	M_ICONVHOOK }, 
+#endif
   { "ignore",		parse_ignore,		0 },
   { "lists",		parse_list,		UL &MailLists },
   { "macro",		mutt_parse_macro,	0 },
diff --git a/rfc2047.c b/rfc2047.c
index f706bafa..f988c85d 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -24,7 +24,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <iconv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>