From: Maxim Mamontov Date: Thu, 7 Apr 2011 15:48:02 +0000 (+0300) Subject: Fix sgconf_xml compilation errors X-Git-Tag: 2.407-rc3~27 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/43ba8e3e23937f2105f8eba4a35f32e8d25b5229?ds=sidebyside Fix sgconf_xml compilation errors --- diff --git a/projects/sgconf_xml/main.cpp b/projects/sgconf_xml/main.cpp index 7f2ed761..03a63a9a 100644 --- a/projects/sgconf_xml/main.cpp +++ b/projects/sgconf_xml/main.cpp @@ -33,9 +33,9 @@ $Date: 2008/01/05 12:11:34 $ #include #include +#include "stg/common.h" +#include "stg/netunit.h" #include "request.h" -#include "common.h" -#include "netunit.h" #define FN_LEN (512) #define REQ_STR_LEN (300) diff --git a/projects/sgconf_xml/parser.cpp b/projects/sgconf_xml/parser.cpp index df18975e..99b48a7b 100644 --- a/projects/sgconf_xml/parser.cpp +++ b/projects/sgconf_xml/parser.cpp @@ -3,8 +3,8 @@ #include #include -#include "common.h" -#include "netunit.h" +#include "stg/common.h" +#include "stg/netunit.h" #include "request.h" int parse_depth = 0; diff --git a/projects/sgconf_xml/request.h b/projects/sgconf_xml/request.h index 17db9277..bbd46325 100644 --- a/projects/sgconf_xml/request.h +++ b/projects/sgconf_xml/request.h @@ -31,21 +31,10 @@ #define request_h #include -#include "resetable.h" -#ifdef LINUX -#include -#endif - -#ifdef FREE_BSD5 -#include -#endif - -#ifdef FREE_BSD -#include -#endif - -#include "stg_const.h" +#include "stg/resetable.h" +#include "stg/os_int.h" +#include "stg/stg_const.h" #ifndef ENODATA #define ENODATA 61