From 237da22e689ef1d75f10926d23669645b809535c Mon Sep 17 00:00:00 2001 From: Russ Combs Date: Wed, 18 Jan 2017 13:54:44 -0500 Subject: [PATCH] add config.h to new files; fix merge error --- src/detection/detection_engine.cc | 4 ++++ src/detection/regex_offload.cc | 4 ++++ src/detection/rtn_checks.cc | 4 ++++ src/service_inspectors/http_inspect/http_flow_data.h | 1 - 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc index f30a6832b..a623dd3f5 100644 --- a/src/detection/detection_engine.cc +++ b/src/detection/detection_engine.cc @@ -18,6 +18,10 @@ // detection_engine.h author Russ Combs +#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 0e59d1874..1baa0511d 100644 --- a/src/detection/regex_offload.cc +++ b/src/detection/regex_offload.cc @@ -18,6 +18,10 @@ // regex_offload.cc author Russ Combs +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "regex_offload.h" #include diff --git a/src/detection/rtn_checks.cc b/src/detection/rtn_checks.cc index 33f3b21c4..a52ce4159 100644 --- a/src/detection/rtn_checks.cc +++ b/src/detection/rtn_checks.cc @@ -23,6 +23,10 @@ // Dan Roelker // Marc Norton +#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 cc9cd4bb3..e74144c3b 100644 --- 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; -- 2.47.2