Create replacement ifaddrs.h if needed.

Remove #ifdef HAVE_IFADDRS_H wrapper.  ok djm@

diff --git a/configure.ac b/configure.ac
index 4179857519f0100a4303b789932131987b29eaf5..6f48e55080261a2e6779ec1a1d08b836aa164d70 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -468,7 +468,6 @@ AC_CHECK_HEADERS([ \
        glob.h \
        ia.h \
        iaf.h \
-       ifaddrs.h \
        inttypes.h \
        langinfo.h \
        limits.h \
@@ -532,7 +531,7 @@ AC_CHECK_HEADERS([ \
 # the equivalent file.  This avoids having to wrap those includes in
 # '#ifdef HAVE_FOO_H'.  If we create any such headers, add the path to includes.
 compatincludes=no
-AC_CHECK_HEADERS([paths.h poll.h stdint.h util.h], [], [
+AC_CHECK_HEADERS([ifaddrs.h paths.h poll.h stdint.h util.h], [], [
     compatincludes="`pwd`/openbsd-compat/include"
     mkdir -p "$compatincludes"
     case "$ac_header" in

diff --git a/readconf.c b/readconf.c
index 0acc08ca1d5bf74d6d3a04f30a86a35677b4cae3..d99205944ecb08f796d666ad10f00cb483ded0b1 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -29,9 +29,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef HAVE_IFADDRS_H
-# include <ifaddrs.h>
-#endif
+#include <ifaddrs.h>
 #include <limits.h>
 #include <netdb.h>
 #include <paths.h>

diff --git a/sshconnect.c b/sshconnect.c
index 79ccbcc6b3aa254fbafdf0912d8ff347bd01c25c..97f65edc7e4a52d27200f1fd91e4cf557dae9a0f 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -41,9 +41,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_IFADDRS_H
-# include <ifaddrs.h>
-#endif
+#include <ifaddrs.h>
 
 #include "xmalloc.h"
 #include "hostfile.h"