Don't include net/art.h in net/rtable.h instead let the two users

include the file themselves.
OK bluhm@ mpi@

diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index 9a7d00a..eecfd02 100644 (file)
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_wg.c,v 1.37 2024/03/05 17:48:01 mvs Exp $ */
+/*     $OpenBSD: if_wg.c,v 1.38 2024/04/09 12:53:08 claudio Exp $ */
 
 /*
  * Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
@@ -42,6 +42,7 @@
 #include <net/pfvar.h>
 #include <net/route.h>
 #include <net/bpf.h>
+#include <net/art.h>
 
 #include <netinet/ip.h>
 #include <netinet/ip6.h>

diff --git a/sys/net/rtable.c b/sys/net/rtable.c
index 48108ce..bc4f558 100644 (file)
--- a/sys/net/rtable.c
+++ b/sys/net/rtable.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtable.c,v 1.86 2024/03/26 10:01:57 bluhm Exp $ */
+/*     $OpenBSD: rtable.c,v 1.87 2024/04/09 12:53:08 claudio Exp $ */
 
 /*
  * Copyright (c) 2014-2016 Martin Pieuchot
@@ -30,6 +30,7 @@
 
 #include <net/rtable.h>
 #include <net/route.h>
+#include <net/art.h>
 
 /*
  * Structures used by rtable_get() to retrieve the corresponding

diff --git a/sys/net/rtable.h b/sys/net/rtable.h
index 441c471..143b517 100644 (file)
--- a/sys/net/rtable.h
+++ b/sys/net/rtable.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtable.h,v 1.28 2023/11/12 17:51:41 bluhm Exp $ */
+/*     $OpenBSD: rtable.h,v 1.29 2024/04/09 12:53:08 claudio Exp $ */
 
 /*
  * Copyright (c) 2014-2016 Martin Pieuchot
@@ -23,7 +23,6 @@
  * Newer routing table implementation based on ART (Allotment Routing
  * Table).
  */
-#include <net/art.h>
 
 #define        rt_key(rt)      ((rt)->rt_dest)
 #define        rt_plen(rt)     ((rt)->rt_plen)