Merge branch 'master' into full-month-stats

[stg.git] / projects / sgconf / request.h

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index 2f2408caaea5925ce7dfeff9abe19ede09e5f0aa..daddec1d3401f6d2eec33d1a2678a98823bd922a 100644 (file)
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -32,9 +32,10 @@
 #define request_h
 
 #include <string>
 #define request_h
 
 #include <string>

-#include "resetable.h"
-#include "stg_const.h"
-#include "os_int.h"
+
+#include "stg/resetable.h"
+#include "stg/const.h"
+#include "stg/os_int.h"

 
 #define TARIFF_NOW  (0)
 #define TARIFF_DEL  (1)
 
 #define TARIFF_NOW  (0)
 #define TARIFF_DEL  (1)


@@ -77,6 +78,7 @@ bool                deleteUser;
 
 RESETABLE<string>   usrMsg;
 RESETABLE<double>   credit;
 
 RESETABLE<string>   usrMsg;
 RESETABLE<double>   credit;

+RESETABLE<time_t>   creditExpire;

 RESETABLE<string>   usrPasswd;
 RESETABLE<bool>     down;
 RESETABLE<bool>     passive;
 RESETABLE<string>   usrPasswd;
 RESETABLE<bool>     down;
 RESETABLE<bool>     passive;