Fix sgconf compilation errors

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 1fc0685a83699ca451157b0312c7455dbf076ce3..60ad3c8473dd9b7bdcbcf3c10cacd160261835b1 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -34,10 +34,10 @@
 #include <iostream>
 #include <iconv.h>
 
+#include "stg/common.h"
+#include "sg_error_codes.h"
 #include "common_sg.h"
 #include "version_sg.h"
-#include "common.h"
-#include "sg_error_codes.h"
 
 using namespace std;
 

diff --git a/projects/sgconf/common_sg.h b/projects/sgconf/common_sg.h
index d36ed750b6c53163e7a65ca99a0dea90a3747721..a654748a68f744ea558ef309d5d2702d21447c4e 100644 (file)
--- a/projects/sgconf/common_sg.h
+++ b/projects/sgconf/common_sg.h
@@ -30,7 +30,7 @@
 
 #include <string>
 
-#include "servconf.h"
+#include "stg/servconf.h"
 #include "request.h"
 
 void UsageConf();

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index ec7dadc77b1a7479e143d2b7959702389ec2626f..69756712450ad8cb1fe74b0777374160a08e1b23 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -37,9 +37,9 @@
 #include <list>
 #include <sstream>
 
+#include "stg/common.h"
+#include "stg/netunit.h"
 #include "request.h"
-#include "common.h"
-#include "netunit.h"
 #include "common_sg.h"
 #include "sg_error_codes.h"
 

diff --git a/projects/sgconf/parser.cpp b/projects/sgconf/parser.cpp
index 990a2971525e24c03a1150161804a002b27cb403..8e1e3cf1fe5c7e4b6fa8595f5b7864658116db14 100644 (file)
--- a/projects/sgconf/parser.cpp
+++ b/projects/sgconf/parser.cpp
@@ -33,9 +33,9 @@
 #include <string>
 #include <list>
 
-#include "common.h"
-#include "netunit.h"
-#include "request.h"
+#include "stg/common.h"
+#include "stg/netunit.h"
+#include "stg/request.h"
 
 using namespace std;
 

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index 6878f6562fe590bdd6f46f7e5a43d458b8a2a3c7..c80986614fcea6a376a3586e480fb1a9d5a2912b 100644 (file)
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -32,9 +32,10 @@
 #define request_h
 
 #include <string>
-#include "resetable.h"
-#include "stg_const.h"
-#include "os_int.h"
+
+#include "stg/resetable.h"
+#include "stg/stg_const.h"
+#include "stg/os_int.h"
 
 #define TARIFF_NOW  (0)
 #define TARIFF_DEL  (1)

diff --git a/projects/sgconf/sginfo.cpp b/projects/sgconf/sginfo.cpp
index aa247dfb37ef343a2c594fff5c1b9204e01b9d33..6879cb05ef2c4559cbd14417ac357474f22cee4d 100644 (file)
--- a/projects/sgconf/sginfo.cpp
+++ b/projects/sgconf/sginfo.cpp
@@ -37,9 +37,9 @@
 #include <list>
 #include <errno.h>
 
+#include "stg/common.h"
+#include "stg/netunit.h"
 #include "request.h"
-#include "common.h"
-#include "netunit.h"
 #include "common_sg.h"
 #include "sg_error_codes.h"