From: Elena Mamontova <helenh463@gmail.com>
Date: Tue, 20 Dec 2016 13:40:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stg-2.409' into ticket37
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/1b2e8014ab6bc93d0ab0fe320ad3cfc8ed94ab81?hp=2efac265830ab1b6cd1e3e0d4b04076174dd3b16

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 27198073..fe40bc50 100644
--- 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 6734a435..8e82d2a8 100644
--- 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>