format: Ensure <netinet/icmp6.h> comes before <netinet/in.h>

diff --git a/.clang-format b/.clang-format
index 6d16c1f75bd3ca5ed7c8b1f14ff9ba0d6a58be6f..4c8859dd607e4717c9f9d34a872ab9637965ad0a 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -146,6 +146,10 @@ IncludeCategories:
   - Regex: '^<netinet/if_ether.h>'
     Priority: 7
     SortPriority:  71
+# Most BSD require <netinet/in.h> before this ...
+  - Regex: '^<netinet/icmp6.h>'
+    Priority: 7
+    SortPriority:  71
   - Regex: '^<net.*/'
     Priority: 7
     SortPriority: 70

diff --git a/src/ipv6nd.c b/src/ipv6nd.c
index db370abbe1be70cd117e80a7408d735ca229bcc1..eafcf4c9a08abdf348ec18bafedd4b4225e35945 100644 (file)
--- a/src/ipv6nd.c
+++ b/src/ipv6nd.c
@@ -32,9 +32,9 @@
 
 #include <net/if.h>
 #include <net/route.h>
-#include <netinet/icmp6.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
+#include <netinet/icmp6.h>
 
 #include <assert.h>
 #include <errno.h>

diff --git a/src/privsep-inet.c b/src/privsep-inet.c
index b5731edd7e4fcf81ac8485d5a935ee0fa0c9a962..590e770b3be6fae10dfa571e176b7584045cc68c 100644 (file)
--- a/src/privsep-inet.c
+++ b/src/privsep-inet.c
@@ -29,8 +29,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <netinet/icmp6.h>
 #include <netinet/in.h>
+#include <netinet/icmp6.h>
 
 #include <assert.h>
 #include <errno.h>