]> granicus.if.org Git - neomutt/commitdiff
fix idna problems
authorRichard Russon <rich@flatcap.org>
Thu, 18 May 2017 16:24:35 +0000 (17:24 +0100)
committerRichard Russon <rich@flatcap.org>
Thu, 18 May 2017 19:20:38 +0000 (20:20 +0100)
mutt_idna.c
mutt_idna.h
mutt_socket.c
mutt_ssl.c

index 5bb554f3fdea7e3400eccc528fbbcaf6fbe3f803..551c16b0fdeac4ef90bb745db086c6731e72ee0b 100644 (file)
@@ -16,7 +16,6 @@
  */
 
 #include "config.h"
-#include <idna.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
index ae125eae5daa674de1431b7757f74b5c841d1b2a..a66d8c5816ba6cd4a39e463a217d6da03a7fe8d0 100644 (file)
 #ifndef _MUTT_IDNA_H
 #define _MUTT_IDNA_H 1
 
+#ifdef HAVE_IDNA_H
+#include <idna.h>
+#elif defined(HAVE_IDN_IDNA_H)
+#include <idn/idna.h>
+#endif
+
 struct Envelope;
 struct Address;
 
index dbdd323f019d529d2959a9b61544b9e457b44858..5e031130d5f23037c5d7bb7328e9eef84c1b2c30 100644 (file)
@@ -20,7 +20,6 @@
 #include "config.h"
 #include <errno.h>
 #include <fcntl.h>
-#include <idna.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <stdio.h>
@@ -28,6 +27,7 @@
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include "mutt_idna.h"
 #include "mutt_socket.h"
 #include "globals.h"
 #include "mutt_tunnel.h"
index bd9ae02967f8c17df581392de9ab7a5ed723546d..c1933ad1ac91bc0312d58b8ca3b05c19ab22e095 100644 (file)
@@ -17,7 +17,6 @@
 
 #include "config.h"
 #include <errno.h>
-#include <idna.h>
 #include <limits.h>
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
@@ -38,6 +37,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt.h"
+#include "mutt_idna.h"
 #include "mutt_ssl.h"
 #include "account.h"
 #include "globals.h"