Make mutt-nntp depend on mutt >= 1.5.21-5

[software/mutt-debian.git] / mutt_idna.h

diff --git a/mutt_idna.h b/mutt_idna.h
index 8a57d60ef77c7d1479577bcf6698bb5ec83fb681..54d94f5fd9a570fe0146b8b6e941659dc0064026 100644 (file)
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2003 Thomas Roessler <roessler@does-not-exist.org>
+ * Copyright (C) 2003,2005 Thomas Roessler <roessler@does-not-exist.org>

  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by


@@ -28,9 +28,9 @@
 
 #define MI_MAY_BE_IRREVERSIBLE         (1 << 0)
 
 
 #define MI_MAY_BE_IRREVERSIBLE         (1 << 0)
 

-int mutt_idna_to_local (const char *, char **, int);
-int mutt_local_to_idna (const char *, char **);
+/* Work around incompatibilities in the libidn API */

 
 

+#ifdef HAVE_LIBIDN

 int mutt_addrlist_to_idna (ADDRESS *, char **);
 int mutt_addrlist_to_local (ADDRESS *);
 
 int mutt_addrlist_to_idna (ADDRESS *, char **);
 int mutt_addrlist_to_local (ADDRESS *);
 


@@ -39,9 +39,6 @@ int mutt_env_to_idna (ENVELOPE *, char **, char **);
 
 const char *mutt_addr_for_display (ADDRESS *a);
 
 
 const char *mutt_addr_for_display (ADDRESS *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_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


@@ -51,6 +48,33 @@ const char *mutt_addr_for_display (ADDRESS *a);
 # 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
 # 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
+#else
+
+static inline int mutt_addrlist_to_idna (ADDRESS *addr, char **err)
+{
+  return 0;
+}
+
+static inline int mutt_addrlist_to_local (ADDRESS *addr)
+{
+  return 0;
+}
+
+static inline void mutt_env_to_local (ENVELOPE *env)
+{
+  return;
+}
+
+static inline int mutt_env_to_idna (ENVELOPE *env, char **tag, char **err)
+{
+  return 0;
+}
+
+static inline const char *mutt_addr_for_display (ADDRESS *a)
+{
+  return a->mailbox;
+}
+
+#endif /* HAVE_LIBIDN */

 
 #endif
 
 #endif