clang-format: Other include ordering changes

src/IP.h

@@ -4,9 +4,11 @@
 
 #include "zeek/zeek-config.h"
 
+// clang-format off
+#include <sys/types.h> // for u_char
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <sys/types.h> // for u_char
+// clang-format on
 
 #ifdef HAVE_NETINET_IP6_H
 #include <netinet/ip6.h>

src/iosource/Manager.cc

@@ -3,8 +3,12 @@
 #include "zeek/iosource/Manager.h"
 
 #include <assert.h>
+// These two files have to remain in the same order or FreeBSD builds
+// stop working.
+// clang-format off
 #include <sys/types.h>
 #include <sys/event.h>
+// clang-format on
 #include <sys/time.h>
 #include <unistd.h>
 

src/packet_analysis/protocol/arp/ARP.h

@@ -2,9 +2,11 @@
 
 #pragma once
 
+// clang-format off
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <net/if_arp.h>
+// clang-format on
 
 #include "zeek/packet_analysis/Analyzer.h"
 #include "zeek/packet_analysis/Component.h"

src/script_opt/IDOptInfo.h

@@ -7,9 +7,9 @@
 
 #include <set>
 
-#include "zeek/IntrusivePtr.h"
-#include "zeek/ID.h"
 #include "zeek/Expr.h"
+#include "zeek/ID.h"
+#include "zeek/IntrusivePtr.h"
 
 namespace zeek::detail
 	{

src/zeek-affinity.cc

@@ -28,8 +28,10 @@ bool set_affinity(int core_number)
 
 #elif defined(__FreeBSD__)
 
+// clang-format off
 #include <sys/param.h>
 #include <sys/cpuset.h>
+// clang-format on
 
 namespace zeek
 	{