add config.h to new files; fix merge error

diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc
index f30a6832b8d60c3977a3e05cdf7cc6bea5392955..a623dd3f55d46cce97806c00fb2b0c7efa249fc8 100644 (file)
--- a/src/detection/detection_engine.cc
+++ b/src/detection/detection_engine.cc
@@ -18,6 +18,10 @@
 
 // detection_engine.h author Russ Combs <rucombs@cisco.com>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "detection_engine.h"
 
 #include "events/sfeventq.h"

diff --git a/src/detection/regex_offload.cc b/src/detection/regex_offload.cc
index 0e59d18748b9fce349bf355a20b693780737c99c..1baa0511d2a51d36440b3f4e5d644c70bc2d6d8d 100644 (file)
--- a/src/detection/regex_offload.cc
+++ b/src/detection/regex_offload.cc
@@ -18,6 +18,10 @@
 
 // regex_offload.cc author Russ Combs <rucombs@cisco.com>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "regex_offload.h"
 
 #include <assert.h>

diff --git a/src/detection/rtn_checks.cc b/src/detection/rtn_checks.cc
index 33f3b21c4faf038e89464220e1999c630972e709..a52ce4159d303fecbc42492a9345c42048c58061 100644 (file)
--- a/src/detection/rtn_checks.cc
+++ b/src/detection/rtn_checks.cc
@@ -23,6 +23,10 @@
 //     Dan Roelker <droelker@sourcefire.com>
 //     Marc Norton <mnorton@sourcefire.com>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "rtn_checks.h"
 
 #include "main/snort_debug.h"

diff --git a/src/service_inspectors/http_inspect/http_flow_data.h b/src/service_inspectors/http_inspect/http_flow_data.h
index cc9cd4bb32f20904bb3e3d7dbb10df4e0246cc92..e74144c3b9fc01e8e959dadf8bac0e43627f01ac 100644 (file)
--- a/src/service_inspectors/http_inspect/http_flow_data.h
+++ b/src/service_inspectors/http_inspect/http_flow_data.h
@@ -117,7 +117,6 @@ private:
         HttpEnums::STAT_NOT_PRESENT };
     MimeSession* mime_state[2] = { nullptr, nullptr };
     UtfDecodeSession* utf_state = nullptr; // SRC_SERVER only
-    class HttpMsgSection* latest_section = nullptr;
     uint64_t expected_trans_num[2] = { 1, 1 };
     HttpMsgSection* latest_section = nullptr;