Pull request #4050: control: code refactor to support all unix flavors

Merge in SNORT/snort3 from ~RCONJEEV/snort3:control_conn_cmd_block_fix to master

Squashed commit of the following:

commit 2a10e5ab32d00bc4aa0389f21fe2bad270d14f93
Author: RAGHURAAM CONJEEVARAM UDAYANAN -X (rconjeev - XORIANT CORPORATION at Cisco) <rconjeev@cisco.com>
Date:   Thu Oct 12 15:26:16 2023 +0530

    control: code refactor to support all unix flavors

diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index 80cf9fe143805d3d2b817d6be25f6a3ea51e8d3e..0ff5722435bf33b419cbaa5f156a24bd9f80ee73 100644 (file)
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -30,7 +30,6 @@
 #include <cassert>
 #include <iostream>
 #include <sstream>
-#include <string>
 #include <unordered_map>
 #include <vector>
 

diff --git a/src/managers/module_manager.h b/src/managers/module_manager.h
index 850ed38ba58458d4a4ccb757a2240134c1a9152c..25fd8085e3cf61db66b97efb5fa063dfd1f506a5 100644 (file)
--- a/src/managers/module_manager.h
+++ b/src/managers/module_manager.h
@@ -27,6 +27,7 @@
 #include <list>
 #include <mutex>
 #include <set>
+#include <string>
 
 #include "framework/counts.h"
 #include "main/analyzer_command.h"