From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Mon, 1 Jul 2019 19:53:12 +0000 (-0400)
Subject: Merge pull request #1662 in SNORT/snort3 from ~DERAMADA/snort3:fix_flow_stash_header... 
X-Git-Tag: 3.0.0-258~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07fa1a0c6c8046c8992c364548a885d7e63dab02;p=thirdparty%2Fsnort3.git

Merge pull request #1662 in SNORT/snort3 from ~DERAMADA/snort3:fix_flow_stash_header to master

Squashed commit of the following:

commit afb1391d7e42c5ffad9e74f34452ed2fe9a4585a
Author: deramada <deramada@cisco.com>
Date:   Mon Jul 1 14:26:30 2019 -0400

    appid: fix header order in appid_session

commit 12bd60e2cb543727d0a55ddb94d96415d262378a
Author: deramada <deramada@cisco.com>
Date:   Mon Jul 1 14:23:48 2019 -0400

    flow: remove config.h from flow_stash_keys
---

diff --git a/src/flow/flow_stash_keys.h b/src/flow/flow_stash_keys.h
index 39057eb7e..ccdde5689 100644
--- a/src/flow/flow_stash_keys.h
+++ b/src/flow/flow_stash_keys.h
@@ -18,10 +18,6 @@
 
 // flow_stash_keys.h author Deepak Ramadass <deramada@cisco.com>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifndef FLOW_STASH_KEYS_H
 #define FLOW_STASH_KEYS_H
 
diff --git a/src/network_inspectors/appid/appid_session.h b/src/network_inspectors/appid/appid_session.h
index 3bc3cf1b7..3d0c47d05 100644
--- a/src/network_inspectors/appid/appid_session.h
+++ b/src/network_inspectors/appid/appid_session.h
@@ -26,9 +26,9 @@
 #include <string>
 #include <unordered_map>
 
-#include "pub_sub/appid_events.h"
 #include "flow/flow.h"
 #include "flow/flow_stash_keys.h"
+#include "pub_sub/appid_events.h"
 
 #include "app_info_table.h"
 #include "appid_api.h"