git.stg.codes
/
stg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5deec54
)
Fix sgconfig plugin compilation errors
author
Maxim Mamontov
<faust@gts.dp.ua>
Thu, 7 Apr 2011 15:37:47 +0000
(18:37 +0300)
committer
Maxim Mamontov
<faust@gts.dp.ua>
Thu, 7 Apr 2011 15:37:47 +0000
(18:37 +0300)
projects/stargazer/plugins/configuration/sgconfig/configproto.h
patch
|
blob
|
history
projects/stargazer/plugins/configuration/sgconfig/parser.cpp
patch
|
blob
|
history
projects/stargazer/plugins/configuration/sgconfig/parser.h
patch
|
blob
|
history
projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
patch
|
blob
|
history
projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
patch
|
blob
|
history
projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
patch
|
blob
|
history
projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
patch
|
blob
|
history
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index 06748da8e73c91a1a18a1806260083a6bf7ca016..8c5aa3c59a5a4b900eb17fd2ea32a4acb43bc043 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/
projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@
-35,11
+35,11
@@
#include <string>
#include <list>
#include <string>
#include <list>
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/stg_logger.h"
#include "parser.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"
#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 042df8035b7a71dff1913aac1a16e3007ebda3d8..30252544c995848d802139f0dfa0be6f93c06571 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/
projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@
-9,11
+9,11
@@
#include <cerrno>
#include <sstream>
#include <cerrno>
#include <sstream>
+#include "stg/version.h"
+#include "stg/tariffs.h"
+#include "stg/user_property.h"
+#include "stg/settings.h"
#include "parser.h"
#include "parser.h"
-#include "version.h"
-#include "tariffs.h"
-#include "user_property.h"
-#include "settings.h"
#define UNAME_LEN (256)
//-----------------------------------------------------------------------------
#define UNAME_LEN (256)
//-----------------------------------------------------------------------------
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/parser.h
b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index 511a073eac1193916e8be1c3824ca46cc4da9c0f..af85b7102f98e72cc5e88d24f0a1b2b218c1e58e 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/
projects/stargazer/plugins/configuration/sgconfig/parser.h
@@
-11,13
+11,13
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
-#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 "st
g/st
ore.h"
+#include "
stg/
admins.h"
+#include "
stg/
admin.h"
+#include "
stg/
users.h"
+#include "stg
/stg
_message.h"
class TARIFFS;
class SETTINGS;
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 389e85750e28a50d725e9853f5fd60846319c3fc..9bac0294bbc171d731ea169813cea5c14e58b966 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
+++ b/
projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
@@
-1,8
+1,8
@@
#include <cstdio> // snprintf
#include <cstring>
#include <cstdio> // snprintf
#include <cstring>
+#include "stg/tariffs.h"
#include "parser.h"
#include "parser.h"
-#include "tariffs.h"
const int pt_mega = 1024 * 1024;
//-----------------------------------------------------------------------------
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 98128832a4835df6165cc4762437b2d5502781f5..479a135703f24edbdaff610732da870e5393e299 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/
projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@
-32,8
+32,8
@@
#include <csignal>
#include <cstdio> // snprintf
#include <csignal>
#include <cstdio> // snprintf
+#include "stg/blowfish.h"
#include "configproto.h"
#include "configproto.h"
-#include "blowfish.h"
#ifndef ENODATA
// FreeBSD 4.* - suxx
#ifndef ENODATA
// FreeBSD 4.* - suxx
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index baf7cbee2e2621b6726c7ec0c6c84e96bc102e26..9ffbc94963e6e4f049d29b27fad153cd529b17ae 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/
projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@
-4,10
+4,10
@@
#include <algorithm>
#include <algorithm>
+#include "stg/tariffs.h"
+#include "stg/admins.h"
+#include "stg/users.h"
#include "stgconfig.h"
#include "stgconfig.h"
-#include "tariffs.h"
-#include "admins.h"
-#include "users.h"
class STGCONFIG_CREATOR
{
class STGCONFIG_CREATOR
{
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index 83ffa59b91991489ca52edf91e36ae8d5232108f..7d490aefb7f0e49865bd351cae51eaf447e28868 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/
projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@
-5,8
+5,8
@@
#include <string>
#include <string>
-#include "plugin.h"
-#include "store.h"
+#include "
stg/
plugin.h"
+#include "st
g/st
ore.h"
#include "configproto.h"
extern "C" PLUGIN * GetPlugin();
#include "configproto.h"
extern "C" PLUGIN * GetPlugin();