From f61f588783b68ff542e6735a90a8dcbe9ad8308e Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Thu, 7 Apr 2011 18:47:42 +0300
Subject: [PATCH] Fix sgconf compilation errors

---
 projects/sgconf/common_sg.cpp | 4 ++--
 projects/sgconf/common_sg.h   | 2 +-
 projects/sgconf/main.cpp      | 4 ++--
 projects/sgconf/parser.cpp    | 6 +++---
 projects/sgconf/request.h     | 7 ++++---
 projects/sgconf/sginfo.cpp    | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 1fc0685a..60ad3c84 100644
--- 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 d36ed750..a654748a 100644
--- 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 ec7dadc7..69756712 100644
--- 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 990a2971..8e1e3cf1 100644
--- 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 6878f656..c8098661 100644
--- 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 aa247dfb..6879cb05 100644
--- 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"
 
-- 
2.44.2