From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 22 Apr 2021 14:52:08 +0000 (-0600)
Subject: misc: include queue.h before other headers
X-Git-Tag: suricata-6.0.3~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01ec2ed674de3bff207ea73b112b1013e852e61d;p=thirdparty%2Fsuricata.git

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.

(cherry picked from commit d4554ec6bb6e4e52fb2e36cf0412c981a4d1d2e9)
---

diff --git a/src/app-layer-expectation.c b/src/app-layer-expectation.c
index 0408086b3c..d7b470f53d 100644
--- a/src/app-layer-expectation.c
+++ b/src/app-layer-expectation.c
@@ -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 int g_expectation_id = -1;
 static int g_expectation_data_id = -1;