From e97c14add5b04aedc7f3f9dba59f665cbad793af Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 24 Sep 2021 14:57:22 -0700
Subject: [PATCH] clang-format: Other include ordering changes

---
 src/IP.h                               | 4 +++-
 src/iosource/Manager.cc                | 4 ++++
 src/packet_analysis/protocol/arp/ARP.h | 2 ++
 src/script_opt/IDOptInfo.h             | 4 ++--
 src/zeek-affinity.cc                   | 2 ++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/IP.h b/src/IP.h
index 8aebb72d92..3c2fbef813 100644
--- a/src/IP.h
+++ b/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>
diff --git a/src/iosource/Manager.cc b/src/iosource/Manager.cc
index d0065ab476..8f669512fa 100644
--- a/src/iosource/Manager.cc
+++ b/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>
 
diff --git a/src/packet_analysis/protocol/arp/ARP.h b/src/packet_analysis/protocol/arp/ARP.h
index 0aa8ebbac0..4adad42347 100644
--- a/src/packet_analysis/protocol/arp/ARP.h
+++ b/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"
diff --git a/src/script_opt/IDOptInfo.h b/src/script_opt/IDOptInfo.h
index 732958a7f8..ada590e2bd 100644
--- a/src/script_opt/IDOptInfo.h
+++ b/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
 	{
diff --git a/src/zeek-affinity.cc b/src/zeek-affinity.cc
index c002181286..f43ea99088 100644
--- a/src/zeek-affinity.cc
+++ b/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
 	{