X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=c728e5e57f1e1867cd0a1a5709b4aa86f512ff49;hp=e2919ff9d44b7e65c9e8b9184a08e51dde25db1b;hb=c0845f1be75f82fb29cc3a15d26b819041e39813;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/mutt_idna.c b/mutt_idna.c
index e2919ff..c728e5e 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -7,14 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
 
 #include "mutt.h"
 #include "charset.h"
@@ -24,7 +21,7 @@
 
 #ifndef HAVE_LIBIDN
 
-int mutt_idna_to_local (const char *in, char **out, int flags)
+int mutt_idna_to_local (const char *in, char **out, int flags __attribute__ ((unused)))
 {
   *out = m_strdup(in);
   return 1;
@@ -132,7 +129,7 @@ static int mbox_to_udomain (const char *mbx, char **user, char **domain)
   return 0;
 }
 
-int mutt_addrlist_to_idna (address_t * a, const char **err)
+int mutt_addrlist_to_idna (address_t * a, char **err)
 {
   char *user = NULL, *domain = NULL;
   char *tmp = NULL;
@@ -245,7 +242,7 @@ void mutt_env_to_local (ENVELOPE * e)
      if (tag) *tag = #a; e = 1; err = NULL; \
   }
 
-int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err)
 {
   int e = 0;