From: Victor Julien <victor@inliniac.net>
Date: Fri, 19 Jul 2019 11:48:33 +0000 (+0200)
Subject: detect: move includes/declarations closer to use
X-Git-Tag: suricata-5.0.0-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a136c917f6bbed2653284eb4be06daa4da2340c;p=thirdparty%2Fsuricata.git

detect: move includes/declarations closer to use
---

diff --git a/src/detect.h b/src/detect.h
index 3bf93273c1..260b888eb8 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -153,8 +153,6 @@ typedef struct DetectAddressHead_ {
 } DetectAddressHead;
 
 
-#include "detect-threshold.h"
-
 typedef struct DetectMatchAddressIPv4_ {
     uint32_t ip;    /**< address in host order, start of range */
     uint32_t ip2;   /**< address in host order, end of range */
@@ -697,12 +695,7 @@ typedef struct DetectEngineLookupFlow_ {
     struct SigGroupHead_ *sgh[256];
 } DetectEngineLookupFlow;
 
-/* Flow status
- *
- * to server
- * to client
- */
-#define FLOW_STATES 2
+#include "detect-threshold.h"
 
 /** \brief threshold ctx */
 typedef struct ThresholdCtx_    {
@@ -753,6 +746,12 @@ enum DetectEngineType
     DETECT_ENGINE_TYPE_TENANT = 3,
 };
 
+/* Flow states:
+ *  toserver
+ *  toclient
+ */
+#define FLOW_STATES 2
+
 /** \brief main detection engine ctx */
 typedef struct DetectEngineCtx_ {
     uint8_t flags;