From 9ad8644e6bfafa45a5fbca4c357da13454746a49 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 7 Apr 2011 18:34:50 +0300 Subject: [PATCH 1/1] Fix postgresql store plugin compilation errors --- .../stargazer/plugins/store/postgresql/postgresql_store.cpp | 2 +- .../stargazer/plugins/store/postgresql/postgresql_store.h | 2 +- .../plugins/store/postgresql/postgresql_store_admins.cpp | 6 +++--- .../store/postgresql/postgresql_store_corporations.cpp | 2 +- .../plugins/store/postgresql/postgresql_store_messages.cpp | 4 ++-- .../plugins/store/postgresql/postgresql_store_services.cpp | 2 +- .../plugins/store/postgresql/postgresql_store_tariffs.cpp | 2 +- .../plugins/store/postgresql/postgresql_store_users.cpp | 6 +++--- .../plugins/store/postgresql/postgresql_store_utils.cpp | 3 +-- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp index fc15d035..fd0ebf5e 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp @@ -46,7 +46,7 @@ #include "postgresql_store.h" #include "postgresql_store_utils.h" -#include "module_settings.h" +#include "stg/module_settings.h" class POSTGRESQL_STORE_CREATOR { diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.h b/projects/stargazer/plugins/store/postgresql/postgresql_store.h index d273803d..a32b155e 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h @@ -35,7 +35,7 @@ #include #include -#include "store.h" +#include "stg/store.h" // Minimal DB version is 5 // Recommended DB version is 6 (support FreeMb logging on disconnects) diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp index 42db6c12..9670ce83 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp @@ -32,10 +32,10 @@ #include +#include "stg/stg_locker.h" +#include "stg/admin_conf.h" +#include "stg/blowfish.h" #include "postgresql_store.h" -#include "stg_locker.h" -#include "admin_conf.h" -#include "blowfish.h" #define adm_enc_passwd "cjeifY8m3" diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp index 6fa3fd50..08848ea4 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp @@ -33,7 +33,7 @@ #include #include "postgresql_store.h" -#include "stg_locker.h" +#include "stg/stg_locker.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetCorpsList(vector * corpsList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp index 9eeea602..e4c87cdd 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp @@ -34,8 +34,8 @@ #include #include "postgresql_store.h" -#include "stg_locker.h" -#include "stg_message.h" +#include "stg/stg_locker.h" +#include "stg/stg_message.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::AddMessage(STG_MSG * msg, const string & login) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp index 88b8049c..82a999f7 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp @@ -34,7 +34,7 @@ #include #include "postgresql_store.h" -#include "stg_locker.h" +#include "stg/stg_locker.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetServicesList(vector * servicesList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp index 352dab00..fc35f788 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp @@ -33,7 +33,7 @@ #include #include "postgresql_store.h" -#include "stg_locker.h" +#include "stg/stg_locker.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetTariffsList(vector * tariffsList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp index 7d8b3b93..c1c48e25 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp @@ -33,10 +33,10 @@ #include -#include "stg_const.h" -#include "postgresql_store.h" -#include "stg_locker.h" +#include "stg/stg_const.h" +#include "stg/stg_locker.h" #include "../../../stg_timer.h" +#include "postgresql_store.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetUsersList(vector * usersList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp index 7c0755a7..c36df0cd 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp @@ -31,8 +31,7 @@ #include -#include "common.h" - +#include "stg/common.h" #include "postgresql_store.h" int POSTGRESQL_STORE::StartTransaction() const -- 2.44.2