Fix sgconf_xml compilation errors

diff --git a/projects/sgconf_xml/main.cpp b/projects/sgconf_xml/main.cpp
index 7f2ed76193eca3e3501176701b37dfee6707b636..03a63a9ada0deb87ca7f990a8f317dbafcd851c9 100644 (file)
--- a/projects/sgconf_xml/main.cpp
+++ b/projects/sgconf_xml/main.cpp
@@ -33,9 +33,9 @@ $Date: 2008/01/05 12:11:34 $
 #include <arpa/inet.h>
 #include <string.h>
 
 #include <arpa/inet.h>
 #include <string.h>
 

+#include "stg/common.h"
+#include "stg/netunit.h"

 #include "request.h"
 #include "request.h"

-#include "common.h"
-#include "netunit.h"

 
 #define FN_LEN          (512)
 #define REQ_STR_LEN     (300)
 
 #define FN_LEN          (512)
 #define REQ_STR_LEN     (300)

diff --git a/projects/sgconf_xml/parser.cpp b/projects/sgconf_xml/parser.cpp
index df18975eb8108e3ca4e4bc11daed92857b2d8cac..99b48a7b19d865fdef5299e3d1519f50ad278bda 100644 (file)
--- a/projects/sgconf_xml/parser.cpp
+++ b/projects/sgconf_xml/parser.cpp
@@ -3,8 +3,8 @@
 #include <expat.h>
 #include <string.h>
 
 #include <expat.h>
 #include <string.h>
 

-#include "common.h"
-#include "netunit.h"
+#include "stg/common.h"
+#include "stg/netunit.h"

 #include "request.h"
 
 int parse_depth = 0;
 #include "request.h"
 
 int parse_depth = 0;

diff --git a/projects/sgconf_xml/request.h b/projects/sgconf_xml/request.h
index 17db9277a9621d5419dbb63e345443c85c400798..bbd46325eb936ba5d7d890d9bdbfb4290453141f 100644 (file)
--- a/projects/sgconf_xml/request.h
+++ b/projects/sgconf_xml/request.h
@@ -31,21 +31,10 @@
 #define request_h
 
 #include <string>
 #define request_h
 
 #include <string>

-#include "resetable.h"

 
 

-#ifdef LINUX
-#include <stdint.h>
-#endif
-
-#ifdef FREE_BSD5
-#include <inttypes.h>
-#endif
-
-#ifdef FREE_BSD
-#include <sys/inttypes.h>
-#endif
-
-#include "stg_const.h"
+#include "stg/resetable.h"
+#include "stg/os_int.h"
+#include "stg/stg_const.h"

 
 #ifndef ENODATA
 #define ENODATA 61
 
 #ifndef ENODATA
 #define ENODATA 61