summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2013-10-17 16:27:39 +0000
committerbluhm <bluhm@openbsd.org>2013-10-17 16:27:39 +0000
commitdc5728648b28d91cc99d2d69701421acb75285aa (patch)
tree600cb1e0f3ff13e01aba5b7d1ab60f81cb69574a /usr.sbin
parentremove capability to do a.out (diff)
downloadwireguard-openbsd-dc5728648b28d91cc99d2d69701421acb75285aa.tar.xz
wireguard-openbsd-dc5728648b28d91cc99d2d69701421acb75285aa.zip
The header file netinet/in_var.h included netinet6/in6_var.h. This
created a bunch of useless dependencies. Remove this implicit inclusion and do an explicit #include <netinet6/in6_var.h> when it is needed. OK mpi@ henning@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ppp/ppp/iface.c3
-rw-r--r--usr.sbin/route6d/route6d.c4
-rw-r--r--usr.sbin/rtadvd/config.c4
-rw-r--r--usr.sbin/rtadvd/rrenum.c4
4 files changed, 8 insertions, 7 deletions
diff --git a/usr.sbin/ppp/ppp/iface.c b/usr.sbin/ppp/ppp/iface.c
index cb4f002f48a..4fa3662df51 100644
--- a/usr.sbin/ppp/ppp/iface.c
+++ b/usr.sbin/ppp/ppp/iface.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: iface.c,v 1.30 2012/01/23 09:13:16 nicm Exp $
+ * $OpenBSD: iface.c,v 1.31 2013/10/17 16:27:47 bluhm Exp $
*/
#include <sys/param.h>
@@ -39,6 +39,7 @@
#include <netinet/in_var.h>
#include <netinet/ip.h>
#ifndef NOINET6
+#include <netinet6/in6_var.h>
#include <netinet6/nd6.h>
#endif
#include <sys/un.h>
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 89a01625ddb..dcc47eb1171 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route6d.c,v 1.58 2013/08/26 14:15:08 naddy Exp $ */
+/* $OpenBSD: route6d.c,v 1.59 2013/10/17 16:27:48 bluhm Exp $ */
/* $KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $ */
/*
@@ -56,7 +56,7 @@
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet/udp.h>
#include <netdb.h>
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 97600efd6cd..aa9bcbec668 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.39 2013/06/01 21:57:12 brad Exp $ */
+/* $OpenBSD: config.c,v 1.40 2013/10/17 16:27:48 bluhm Exp $ */
/* $KAME: config.c,v 1.62 2002/05/29 10:13:10 itojun Exp $ */
/*
@@ -41,7 +41,7 @@
#include <net/if_dl.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet/icmp6.h>
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index a99e6018d57..484dac6277a 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rrenum.c,v 1.15 2013/05/18 07:34:59 jmc Exp $ */
+/* $OpenBSD: rrenum.c,v 1.16 2013/10/17 16:27:48 bluhm Exp $ */
/* $KAME: rrenum.c,v 1.11 2002/05/21 14:26:55 itojun Exp $ */
/*
@@ -38,7 +38,7 @@
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
-#include <netinet/in_var.h>
+#include <netinet6/in6_var.h>
#include <netinet/icmp6.h>
#include <arpa/inet.h>