]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
misc: include queue.h before other headers 6078/head
authorJason Ish <jason.ish@oisf.net>
Thu, 22 Apr 2021 14:52:08 +0000 (08:52 -0600)
committerVictor Julien <victor@inliniac.net>
Thu, 22 Apr 2021 18:59:11 +0000 (20:59 +0200)
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

index fd9ab6edbf15deda4db7def91999d6525979f384..06c74f263c05bb75d38f1147778b49daaba66970 100644 (file)
@@ -52,6 +52,7 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
+#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 };