X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.h;h=5acc31d17f5a9e4b58eb212b19dfb5310bd65052;hp=25443b2bb7e8cc469f677edd422c81f739fffab8;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235 diff --git a/mutt_idna.h b/mutt_idna.h index 25443b2..5acc31d 100644 --- a/mutt_idna.h +++ b/mutt_idna.h @@ -10,42 +10,14 @@ #ifndef _MUTT_IDNA_H # define _MUTT_IDNA_H -#if HAVE_CONFIG_H -# include "config.h" -#endif - #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); -int mutt_local_to_idna (const char *, char **); int mutt_addrlist_to_idna (address_t *, char **); int mutt_addrlist_to_local (address_t *); void mutt_env_to_local (ENVELOPE *); -int mutt_env_to_idna (ENVELOPE *, const char **, const char **); +int mutt_env_to_idna (ENVELOPE *, const char **, 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