minor tweaks and updates

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 20ccf04d462ce7d0aec7d210216e7fff7e6bba72..55996334e4fc045d537a5fe36b263e54ae6712fe 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -141,8 +141,7 @@ add_custom_command(OUTPUT snort_manual.pdf
         -f pdf 
         ${PDF_ARGUMENTS} 
         ${CMAKE_CURRENT_BINARY_DIR}/snort_manual.txt 
-    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/snort_manual.txt
-    DEPENDS  ${ALL_SOURCES}
+    DEPENDS  ${ALL_SOURCES} snort_manual.html
     COMMENT "Documents: building snort_manual.pdf"
 )
 
@@ -157,7 +156,6 @@ add_custom_command(OUTPUT snort_manual.tgz
         -E tar 
         zcf snort_manual.tgz
         ${CMAKE_CURRENT_BINARY_DIR}/snort_manual.chunked
-    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/snort_manual.txt
     DEPENDS ${ALL_SOURCES}
     COMMENT "Documents: building snort_manual.tgz"
 )

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index d2dd0c79ec9bff3d70562da4ac1b315ffa758607..8cdc0a5af1404c7e06ef6d819fbb66d508d27ade 100644 (file)
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.8)
 project(snort CXX C)
 
 find_package(PkgConfig REQUIRED)

diff --git a/src/codecs/ip/cd_icmp4.cc b/src/codecs/ip/cd_icmp4.cc
index e74b1ccac3832a981db3133af5a5a2909c9442ae..41ea008887be4536956813bd9a6f1a8646df18e4 100644 (file)
--- a/src/codecs/ip/cd_icmp4.cc
+++ b/src/codecs/ip/cd_icmp4.cc
@@ -453,12 +453,12 @@ void Icmp4Codec::ICMP4MiscTests (Packet *p)
 namespace
 {
 
-typedef struct {
+struct IcmpHdr {
     uint8_t type;
     uint8_t code;
     uint16_t cksum;
     uint32_t unused;
-} IcmpHdr;
+} ;
 
 } // namespace
 

diff --git a/src/framework/value.cc b/src/framework/value.cc
index 825f3180e71b96c47e10c66f48532f5b3d3de730..2aa68dbc8512add5df66ddfd99797ca84b271831 100644 (file)
--- a/src/framework/value.cc
+++ b/src/framework/value.cc
@@ -91,7 +91,7 @@ void Value::get_bits(PortList& list) const
     assert(len == list.size());
 
     for ( unsigned n = 0; n < len; ++n )
-    {   
+    {
         if ( str[n] == '1' )
             list.set(n);
     }
@@ -117,7 +117,7 @@ void Value::get_bits(ByteList& list) const
     assert(len == list.size());
 
     for ( unsigned n = 0; n < len; ++n )
-    {   
+    {
         if ( str[n] == '1' )
             list.set(n);
     }