Fix rscriptd compilation errors

diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp
index 814eb1d8e7ae77590f3ccebf4a7e00de36abdc1c..e6bd4d77788c0362f5db0fe8a8173721589f5ab1 100644 (file)
--- a/projects/rscriptd/listener.cpp
+++ b/projects/rscriptd/listener.cpp
@@ -33,10 +33,10 @@
 #include <sstream>
 #include <algorithm>
 
 #include <sstream>
 #include <algorithm>
 

+#include "stg/script_executer.h"
+#include "stg/stg_locker.h"
+#include "stg/common.h"

 #include "listener.h"
 #include "listener.h"

-#include "script_executer.h"
-#include "stg_locker.h"
-#include "common.h"

 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
 void Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
 void Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);

diff --git a/projects/rscriptd/listener.h b/projects/rscriptd/listener.h
index abc03f6f9e60e16f21b8a46bafb11aa9d70a8a04..16c492190a5853eef55f66d6cff634215488b311 100644 (file)
--- a/projects/rscriptd/listener.h
+++ b/projects/rscriptd/listener.h
@@ -26,10 +26,10 @@
 #include <list>
 #include <functional>
 
 #include <list>
 #include <functional>
 

-#include "os_int.h"
-#include "blowfish.h"
-#include "rs_packets.h"
-#include "stg_logger.h"
+#include "stg/os_int.h"
+#include "stg/blowfish.h"
+#include "stg/rs_packets.h"
+#include "stg/stg_logger.h"

 
 struct UserData
 {
 
 struct UserData
 {

diff --git a/projects/rscriptd/main.cpp b/projects/rscriptd/main.cpp
index 7dc165644884a751a43504b59b70346bfb797eb4..2f5f0baa5a642e29c7d59b5b80a9b8725e737e6b 100644 (file)
--- a/projects/rscriptd/main.cpp
+++ b/projects/rscriptd/main.cpp
@@ -38,13 +38,13 @@
 #include <csignal>
 #include <set>
 
 #include <csignal>
 #include <set>
 

-#include "common.h"
-#include "stg_logger.h"
-#include "script_executer.h"
-#include "conffiles.h"
+#include "stg/common.h"
+#include "stg/stg_logger.h"
+#include "stg/script_executer.h"
+#include "stg/conffiles.h"
+#include "stg/version.h"

 #include "listener.h"
 #include "pidfile.h"
 #include "listener.h"
 #include "pidfile.h"

-#include "version.h"

 
 using namespace std;
 
 
 using namespace std;