X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.h;h=b047e4b5a10116696d02c52444b4cdc37fb4131f;hp=25443b2bb7e8cc469f677edd422c81f739fffab8;hb=28dbd9fbf148be07366048163fffbf7f55a57def;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/mutt_idna.h b/mutt_idna.h
index 25443b2..b047e4b 100644
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -17,16 +17,12 @@
 #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);
 int mutt_local_to_idna (const char *, char **);
 
-int mutt_addrlist_to_idna (address_t *, char **);
+int mutt_addrlist_to_idna (address_t *, const char **);
 int mutt_addrlist_to_local (address_t *);
 
 void mutt_env_to_local (ENVELOPE *);
@@ -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