Merge remote-tracking branch 'origin/stg-2.409' into ticket37

diff --git a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
index 27198073cfc255951df2b920f852e55481d8f6ac..fe40bc500ddaf9e88a058304759e1273a71cc64e 100644 (file)
--- a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
+++ b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
@@ -35,7 +35,7 @@ class TARIFFS;
 class ADMINS;
 class TRAFFCOUNTER;
 class SETTINGS;
-class RAW_PACKET;
+struct RAW_PACKET;
 
 class TRAFFCOUNTER;
 

diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h
index 6734a435351c4a2aa2039adeab06986c1d882c73..8e82d2a84e17b099ef63a8b0ad288cc3bdc66c06 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -31,6 +31,7 @@
 #include <time.h>
 #else
 #include <ctime>
+#include <climits> // NAME_MAX
 #endif
 #include <string>
 #include <sstream>