please, libidn has not changed in years now

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/mutt_idna.c b/mutt_idna.c
index e2919ff..2950ff5 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -11,6 +11,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
+
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>

diff --git a/mutt_idna.h b/mutt_idna.h
index 8742bc7..b047e4b 100644 (file)
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -17,10 +17,6 @@
 #include <lib-mime/mime.h>
 #include "charset.h"
 
-#ifdef HAVE_LIBIDN
-#include <idna.h>
-#endif
-
 #define MI_MAY_BE_IRREVERSIBLE         (1 << 0)
 
 int mutt_idna_to_local (const char *, char **, int);
@@ -34,18 +30,4 @@ int mutt_env_to_idna (ENVELOPE *, const char **, const char **);
 
 const char *mutt_addr_for_display (address_t * a);
 
-/* Work around incompatibilities in the libidn API */
-
-#ifdef HAVE_LIBIDN
-# if (!defined(HAVE_IDNA_TO_ASCII_8Z) && defined(HAVE_IDNA_TO_ASCII_FROM_UTF8))
-#  define idna_to_ascii_8z(a,b,c) idna_to_ascii_from_utf8(a,b,(c)&1,((c)&2)?1:0)
-# endif
-# if (!defined(HAVE_IDNA_TO_ASCII_LZ) && defined(HAVE_IDNA_TO_ASCII_FROM_LOCALE))
-#  define idna_to_ascii_lz(a,b,c) idna_to_ascii_from_locale(a,b,(c)&1,((c)&2)?1:0)
-# endif
-# if (!defined(HAVE_IDNA_TO_UNICODE_8Z8Z) && defined(HAVE_IDNA_TO_UNICODE_UTF8_FROM_UTF8))
-#  define idna_to_unicode_8z8z(a,b,c) idna_to_unicode_utf8_from_utf8(a,b,(c)&1,((c)&2)?1:0)
-# endif
-#endif
-
 #endif