From: Maxim Mamontov Date: Thu, 7 Apr 2011 15:37:47 +0000 (+0300) Subject: Fix sgconfig plugin compilation errors X-Git-Tag: 2.407-rc3~42 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/03f1c4e01b98531d28f040e47974750537b05c2f Fix sgconfig plugin compilation errors --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h index 06748da8..8c5aa3c5 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h @@ -35,11 +35,11 @@ #include #include +#include "stg/users.h" +#include "stg/admins.h" +#include "stg/tariffs.h" +#include "stg/stg_logger.h" #include "parser.h" -#include "users.h" -#include "admins.h" -#include "tariffs.h" -#include "stg_logger.h" #define STG_HEADER "SG04" #define OK_HEADER "OKHD" diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp index 042df803..30252544 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -9,11 +9,11 @@ #include #include +#include "stg/version.h" +#include "stg/tariffs.h" +#include "stg/user_property.h" +#include "stg/settings.h" #include "parser.h" -#include "version.h" -#include "tariffs.h" -#include "user_property.h" -#include "settings.h" #define UNAME_LEN (256) //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index 511a073e..af85b710 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -11,13 +11,13 @@ #include #include -#include "resetable.h" -#include "stg_const.h" -#include "store.h" -#include "admins.h" -#include "admin.h" -#include "users.h" -#include "stg_message.h" +#include "stg/resetable.h" +#include "stg/stg_const.h" +#include "stg/store.h" +#include "stg/admins.h" +#include "stg/admin.h" +#include "stg/users.h" +#include "stg/stg_message.h" class TARIFFS; class SETTINGS; diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp index 389e8575..9bac0294 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp @@ -1,8 +1,8 @@ #include // snprintf #include +#include "stg/tariffs.h" #include "parser.h" -#include "tariffs.h" const int pt_mega = 1024 * 1024; //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index 98128832..479a1357 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -32,8 +32,8 @@ #include #include // snprintf +#include "stg/blowfish.h" #include "configproto.h" -#include "blowfish.h" #ifndef ENODATA // FreeBSD 4.* - suxx diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index baf7cbee..9ffbc949 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -4,10 +4,10 @@ #include +#include "stg/tariffs.h" +#include "stg/admins.h" +#include "stg/users.h" #include "stgconfig.h" -#include "tariffs.h" -#include "admins.h" -#include "users.h" class STGCONFIG_CREATOR { diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h index 83ffa59b..7d490aef 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h @@ -5,8 +5,8 @@ #include -#include "plugin.h" -#include "store.h" +#include "stg/plugin.h" +#include "stg/store.h" #include "configproto.h" extern "C" PLUGIN * GetPlugin();