X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.h;h=b047e4b5a10116696d02c52444b4cdc37fb4131f;hp=8742bc7f73a564b09de7eb0534f01a7f909d6dc6;hb=ebc89176d4b5d2b1363114bd716c7f7fcb2464aa;hpb=24a996896edb7b7fc8f5fd5950a07c4a52a42d05 diff --git a/mutt_idna.h b/mutt_idna.h index 8742bc7..b047e4b 100644 --- a/mutt_idna.h +++ b/mutt_idna.h @@ -17,10 +17,6 @@ #include #include "charset.h" -#ifdef HAVE_LIBIDN -#include -#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