merge from 2.2

diff --git a/source/lib/interfaces.c b/source/lib/interfaces.c
index 7b8ef0d0c1bcb86d6a86863058fbef1f1aec6962..96f4b4cd94fefdf3169a72b2bd076dc018207ebd 100644 (file)
--- a/source/lib/interfaces.c
+++ b/source/lib/interfaces.c
@@ -41,10 +41,6 @@
 #include <sys/time.h>
 #include <net/if.h>
 
-#ifndef SIOCGIFCONF
-#include <sys/sockio.h>
-#endif
-
 #ifdef AUTOCONF_TEST
 struct iface_struct {
        char name[16];
@@ -56,6 +52,16 @@ struct iface_struct {
 #include "interfaces.h"
 #endif
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifndef SIOCGIFCONF
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#endif
+
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif