Merge pull request #289 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to...

Squashed commit of the following:

commit 81aaf8eac05040a6d29477f23b126c5a43690073
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Feb 23 21:52:01 2016 -0500

    Fix Linux+Clang build errors.

diff --git a/src/latency/rule_latency.cc b/src/latency/rule_latency.cc
index 39ed19524a0dde6144a03fb62e71dc4f9551fed5..3ae3b3ebab35f696ac8c461b914f301a7d909dc9 100644 (file)
--- a/src/latency/rule_latency.cc
+++ b/src/latency/rule_latency.cc
@@ -25,6 +25,7 @@
 #endif
 
 #include <cassert>
+#include <sstream>
 
 #include "detection/detection_options.h"
 #include "events/event_queue.h"

diff --git a/src/loggers/alert_luajit.cc b/src/loggers/alert_luajit.cc
index b0d0cf91819ba9d6ee26442416c2a3163dab3815..fc152e1a880c39faec8e18e566fd389f98c72896 100644 (file)
--- a/src/loggers/alert_luajit.cc
+++ b/src/loggers/alert_luajit.cc
@@ -24,6 +24,7 @@
 #include "main/snort_types.h"
 #include "events/event.h"
 #include "helpers/chunk.h"
+#include "log/messages.h"
 #include "lua/lua.h"
 #include "managers/event_manager.h"
 #include "managers/module_manager.h"

diff --git a/src/stream/tcp/segment_overlap_editor.cc b/src/stream/tcp/segment_overlap_editor.cc
index 333b1dc0f150a2f94ea6d5e49471f28c6c502e1a..7ed634ecfa9aa76e42cb2ea213953769cabf3c9c 100644 (file)
--- a/src/stream/tcp/segment_overlap_editor.cc
+++ b/src/stream/tcp/segment_overlap_editor.cc
@@ -19,6 +19,9 @@
 // segment_overlap_editor.cc author davis mcpherson <davmcphe@@cisco.com>
 // Created on: Oct 11, 2015
 
+#include "segment_overlap_editor.h"
+
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 
@@ -26,7 +29,6 @@
 #include "tcp_event_logger.h"
 #include "tcp_normalizer.h"
 #include "tcp_reassembler.h"
-#include "segment_overlap_editor.h"
 
 bool SegmentOverlapEditor::is_segment_retransmit(void)
 {

diff --git a/src/stream/tcp/tcp_tracker.cc b/src/stream/tcp/tcp_tracker.cc
index 470d99d52ace6d91687920555c2df4e8af51cccc..ca9ae7b6d3802d2e752500e873af3891701fdaaf 100644 (file)
--- a/src/stream/tcp/tcp_tracker.cc
+++ b/src/stream/tcp/tcp_tracker.cc
@@ -19,11 +19,13 @@
 // tcp_tracker.cc author davis mcpherson <davmcphe@@cisco.com>
 // Created on: Dec 1, 2015
 
+#include "tcp_tracker.h"
+
+#include "log/messages.h"
 #include "profiler/profiler_defs.h"
 #include "tcp_module.h"
 #include "tcp_normalizers.h"
 #include "tcp_reassemblers.h"
-#include "tcp_tracker.h"
 
 TcpTracker::TcpTracker(bool client) :
     TcpStreamTracker(client)

diff --git a/src/utils/bitop.h b/src/utils/bitop.h
index 1118d9cc6e2e43ebd3f5bd42a34cf70bfba46942..98b1dad510dc8b60d1a8ace58e17a57bea294165 100644 (file)
--- a/src/utils/bitop.h
+++ b/src/utils/bitop.h
@@ -26,6 +26,7 @@
 // A simple, dynamically sized bit vector implementation
 
 #include <cassert>
+#include <cstdint>
 #include <cstring>
 
 class BitOp