From: Richard Russon <rich@flatcap.org>
Date: Thu, 18 May 2017 16:24:35 +0000 (+0100)
Subject: fix idna problems
X-Git-Tag: neomutt-20170526~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc388230f79d3ab8f2c5f50a239083ba44f3bfa7;p=neomutt

fix idna problems
---

diff --git a/mutt_idna.c b/mutt_idna.c
index 5bb554f3f..551c16b0f 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -16,7 +16,6 @@
  */
 
 #include "config.h"
-#include <idna.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/mutt_idna.h b/mutt_idna.h
index ae125eae5..a66d8c581 100644
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -18,6 +18,12 @@
 #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;
 
diff --git a/mutt_socket.c b/mutt_socket.c
index dbdd323f0..5e031130d 100644
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -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"
diff --git a/mutt_ssl.c b/mutt_ssl.c
index bd9ae0296..c1933ad1a 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -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"