From d4554ec6bb6e4e52fb2e36cf0412c981a4d1d2e9 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Thu, 22 Apr 2021 08:52:08 -0600 Subject: [PATCH] misc: include queue.h before other headers At least on FreeBSD, some other include is including "sys/queue.h" which results in FreeBSDs /usr/include/sys/queue.h being picked up and setting __SYS_QUEUE_H__ so our queue.h is not picked up. But the FreeBSD queue.h does not have the CIRCLEQ definitions. To fix just include our queue.h first, which also sets __SYS_QUEUE_H__ preventing the system one from being picked up. --- src/app-layer-expectation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-layer-expectation.c b/src/app-layer-expectation.c index fd9ab6edbf..06c74f263c 100644 --- a/src/app-layer-expectation.c +++ b/src/app-layer-expectation.c @@ -52,6 +52,7 @@ * \author Eric Leblond */ +#include "queue.h" #include "suricata-common.h" #include "debug.h" @@ -61,7 +62,6 @@ #include "app-layer-expectation.h" #include "util-print.h" -#include "queue.h" static IPPairStorageId g_ippair_expectation_id = { .id = -1 }; static FlowStorageId g_flow_expectation_id = { .id = -1 }; -- 2.47.2