Fix stglibs compilation errors

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index f924867bac7c1afa178ce292527a1d17952e5d3a..beba4508dd96b2070087a51b019fca4e3210bc1e 100644 (file)
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -34,8 +34,8 @@
 #endif
 #include <string>
 
 #endif
 #include <string>
 

-#include "os_int.h"
-#include "stg_const.h"
+#include "stg/os_int.h"
+#include "stg/stg_const.h"

 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)
 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)

diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index f839f7c572aec722975fa0179d92a2da461a3c47..ea51939aeea458ff19ebe83b5ef2aaabb518e3ca 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -41,7 +41,7 @@
 #include <fstream>
 
 #include "conffiles.h"
 #include <fstream>
 
 #include "conffiles.h"

-#include "common.h"
+#include "stg/common.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/stglibs/conffiles.lib/conffiles.h b/stglibs/conffiles.lib/conffiles.h
index ae2c8fd023d29eb61d535c1460c9cbe101f65d1a..6909c6c91290c5d9e1eeff79d5f5814d161ecdc9 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.h
+++ b/stglibs/conffiles.lib/conffiles.h
@@ -35,7 +35,7 @@
 #include <map>
 #include <string>
 
 #include <map>
 #include <string>
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 using namespace std;
 //---------------------------------------------------------------------------
 
 using namespace std;
 //---------------------------------------------------------------------------

diff --git a/stglibs/crypto.lib/ag_md5.h b/stglibs/crypto.lib/ag_md5.h
index 3b54b5023e38ba6ff6fad35c44957a4cc247ae28..9a8b16a0ac1b9acd06da4b838b695f3d3ac26771 100644 (file)
--- a/stglibs/crypto.lib/ag_md5.h
+++ b/stglibs/crypto.lib/ag_md5.h
@@ -1,9 +1,9 @@
 #ifndef _MD5_H
 #define _MD5_H
 
 #ifndef _MD5_H
 #define _MD5_H
 

-#include <time.h>
+#include <ctime>

 
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 struct MD5Context {
        uint32_t buf[4];
 
 struct MD5Context {
        uint32_t buf[4];

diff --git a/stglibs/crypto.lib/blowfish.cpp b/stglibs/crypto.lib/blowfish.cpp
index ab3122b92fb0f5fef26441b6dec80562bf69a845..e9d2bde41159678c4157839d0f40a9eec82d7a9d 100644 (file)
--- a/stglibs/crypto.lib/blowfish.cpp
+++ b/stglibs/crypto.lib/blowfish.cpp
@@ -5,10 +5,10 @@
  * Description:  C implementation of the Blowfish algorithm.
  */
 
  * Description:  C implementation of the Blowfish algorithm.
  */
 

-#include <string.h>
+#include <cstring>

 
 #include "blowfish.h"
 
 #include "blowfish.h"

-#include "stg_const.h"
+#include "stg/stg_const.h"

 
 /*typedef struct _BCoptions
     {
 
 /*typedef struct _BCoptions
     {

diff --git a/stglibs/crypto.lib/blowfish.h b/stglibs/crypto.lib/blowfish.h
index e0cf2068a9b155f7595c268ec364cb0d84455424..45d92110810f91a1ce229bcb8601ef2f373026cf 100644 (file)
--- a/stglibs/crypto.lib/blowfish.h
+++ b/stglibs/crypto.lib/blowfish.h
@@ -8,7 +8,7 @@
 #ifndef BLOWFISH_H
 #define BLOWFISH_H
 
 #ifndef BLOWFISH_H
 #define BLOWFISH_H
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 #define MAXKEYBYTES 56          /* 448 bits */
 
 
 #define MAXKEYBYTES 56          /* 448 bits */
 

diff --git a/stglibs/dotconfpp.lib/dotconfpp.h b/stglibs/dotconfpp.lib/dotconfpp.h
index 67835fb8ace5579cbe59f39bbb7c280e65344264..8c2a82ade7fe9c55cc76d51daf89d9896a594046 100644 (file)
--- a/stglibs/dotconfpp.lib/dotconfpp.h
+++ b/stglibs/dotconfpp.lib/dotconfpp.h
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <limits.h>
 
 #include <unistd.h>
 #include <limits.h>
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 typedef void (* DOTCONFCallback) (void * data, const char * buf);
 
 
 typedef void (* DOTCONFCallback) (void * data, const char * buf);
 

diff --git a/stglibs/dotconfpp.lib/mempool.h b/stglibs/dotconfpp.lib/mempool.h
index 73b3c4c301b55d5a7bf9000599bb792f315e7b2e..9975611dace2fa4592f2907552f55d90fb2ab59d 100644 (file)
--- a/stglibs/dotconfpp.lib/mempool.h
+++ b/stglibs/dotconfpp.lib/mempool.h
@@ -19,8 +19,6 @@
 #ifndef ASYNC_DNS_MEMPOOL_H
 #define ASYNC_DNS_MEMPOOL_H
 
 #ifndef ASYNC_DNS_MEMPOOL_H
 #define ASYNC_DNS_MEMPOOL_H
 

-#include "os_int.h"
-

 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>

diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.cpp b/stglibs/ia_auth_c.lib/ia_auth_c.cpp
index b5eb4ddc526eab2913d722651eb7eafa2a6f08ba..075a191376d4c3f7c90902ac9dd58917bf3013d7 100644 (file)
--- a/stglibs/ia_auth_c.lib/ia_auth_c.cpp
+++ b/stglibs/ia_auth_c.lib/ia_auth_c.cpp
@@ -49,7 +49,7 @@
     #include <unistd.h>
 #endif
 
     #include <unistd.h>
 #endif
 

-#include "common.h"
+#include "stg/common.h"

 #include "ia_auth_c.h"
 
 #define IA_NONE            (0)
 #include "ia_auth_c.h"
 
 #define IA_NONE            (0)

diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.h b/stglibs/ia_auth_c.lib/ia_auth_c.h
index 1a1ea039e7b4a0622af6e58776dbcbd34ee1bfa4..0a916f4cb4f86a3bc7c7e6b499d75f753a3d926f 100644 (file)
--- a/stglibs/ia_auth_c.lib/ia_auth_c.h
+++ b/stglibs/ia_auth_c.lib/ia_auth_c.h
@@ -38,8 +38,8 @@
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
 

-#include "blowfish.h"
-#include "ia_packets.h"
+#include "stg/blowfish.h"
+#include "stg/ia_packets.h"

 
 #define IA_BIND_ERROR           (1)
 #define IA_SERVER_ERROR         (2)
 
 #define IA_BIND_ERROR           (1)
 #define IA_SERVER_ERROR         (2)

diff --git a/stglibs/pinger.lib/pinger.cpp b/stglibs/pinger.lib/pinger.cpp
index a33f810bb272169251a40e2e87bc3a9feb3f7e76..68137d7cbd71486abbcb59ad3f80c64cf3262ad4 100644 (file)
--- a/stglibs/pinger.lib/pinger.cpp
+++ b/stglibs/pinger.lib/pinger.cpp
@@ -15,8 +15,8 @@
 #include <stdio.h>
 
 #include "pinger.h"
 #include <stdio.h>
 
 #include "pinger.h"

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

 
 #ifdef STG_TIME
 extern volatile time_t stgTime;
 
 #ifdef STG_TIME
 extern volatile time_t stgTime;

diff --git a/stglibs/pinger.lib/pinger.h b/stglibs/pinger.lib/pinger.h
index f1f442e136eafacfe8c70eabb4487754b4be4d90..b1b777813fc617f0710ae51799a76b3c80a2f804 100644 (file)
--- a/stglibs/pinger.lib/pinger.h
+++ b/stglibs/pinger.lib/pinger.h
@@ -27,7 +27,7 @@
 #include <arpa/inet.h>
 #endif
 
 #include <arpa/inet.h>
 #endif
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR
 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR

diff --git a/stglibs/script_executer.lib/script_executer.h b/stglibs/script_executer.lib/script_executer.h
index 19d458e373021bf9704f53e1076f7c9146c12935..12ba099950b71e26815d3a3757954e1aeee558b2 100644 (file)
--- a/stglibs/script_executer.lib/script_executer.h
+++ b/stglibs/script_executer.lib/script_executer.h
@@ -2,7 +2,6 @@
 #define SCRIPT_EXECUTER_H
 
 #include <string>
 #define SCRIPT_EXECUTER_H
 
 #include <string>

-#include <sys/types.h>

 
 int ScriptExec(const std::string & str);
 void Executer(int msgKey, int msgID, pid_t pid, char * procName);
 
 int ScriptExec(const std::string & str);
 void Executer(int msgKey, int msgID, pid_t pid, char * procName);

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index bcfc113ea34293b5a2f13b0cdcf5b8d49edabfc9..7f304e2aa54ce645778b34b440ffce8388d0f5f1 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -33,7 +33,7 @@
 #include <cstring>
 
 #include "netunit.h"
 #include <cstring>
 
 #include "netunit.h"

-#include "common.h"
+#include "stg/common.h"

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

diff --git a/stglibs/srvconf.lib/netunit.h b/stglibs/srvconf.lib/netunit.h
index 91218b186284a02eec340ee444e0e64fcb34b16e..e288df86595e272e4aabcc6b597fe70b60459e5c 100644 (file)
--- a/stglibs/srvconf.lib/netunit.h
+++ b/stglibs/srvconf.lib/netunit.h
@@ -34,8 +34,7 @@
 #include <list>
 #include <string>
 
 #include <list>
 #include <string>
 

-#include "common.h"
-#include "blowfish.h"
+#include "stg/blowfish.h"

 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"

diff --git a/stglibs/srvconf.lib/parser.cpp b/stglibs/srvconf.lib/parser.cpp
index 9373952e3752387f48f7b85eb94570fe912ef5cf..d7c7568f848aaf63fc2f9b1c3198dc274090621a 100644 (file)
--- a/stglibs/srvconf.lib/parser.cpp
+++ b/stglibs/srvconf.lib/parser.cpp
@@ -33,8 +33,8 @@
 #include <arpa/inet.h>
 #include <string>
 
 #include <arpa/inet.h>
 #include <string>
 

-#include "common.h"
-#include "stg_const.h"
+#include "stg/common.h"
+#include "stg/stg_const.h"

 #include "servconf.h"
 
 using namespace std;
 #include "servconf.h"
 
 using namespace std;

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a7cac13c3330c035a61590a5e234dcfaaa7a8842..a28e2e861f1734b91ae19bf657279b63bc012dfb 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -27,6 +27,7 @@
 #include <cstdio>
 #include <cstring>
 
 #include <cstdio>
 #include <cstring>
 

+#include "stg/common.h"

 #include "servconf.h"
 
 using namespace std;
 #include "servconf.h"
 
 using namespace std;

diff --git a/stglibs/srvconf.lib/servconf.h b/stglibs/srvconf.lib/servconf.h
index a58d2952a6fdeb6ea811bd9eacd3b4d65cd09154..a2a74081396aa516853263444645395ad6c0f9d1 100644 (file)
--- a/stglibs/srvconf.lib/servconf.h
+++ b/stglibs/srvconf.lib/servconf.h
@@ -32,9 +32,9 @@
 #include <list>
 #include <string>
 
 #include <list>
 #include <string>
 

-#include "os_int.h"
+#include "stg/os_int.h"
+#include "stg/stg_const.h"

 #include "netunit.h"
 #include "netunit.h"

-#include "stg_const.h"

 
 void Start(void *data, const char *el, const char **attr);
 void End(void *data, const char *el);
 
 void Start(void *data, const char *el, const char **attr);
 void End(void *data, const char *el);

diff --git a/stglibs/stg_locker.lib/stg_locker.cpp b/stglibs/stg_locker.lib/stg_locker.cpp
index be0aa0061e66df75397302f875ecf11a9491c598..0f4007cc3e95dd8d77147269d11eb373551bb090 100644 (file)
--- a/stglibs/stg_locker.lib/stg_locker.cpp
+++ b/stglibs/stg_locker.lib/stg_locker.cpp
@@ -27,6 +27,7 @@
 
 
 #include <pthread.h>
 
 
 #include <pthread.h>

+

 #include "stg_locker.h"
 
 #ifdef DEBUG_LOCKER
 #include "stg_locker.h"
 
 #ifdef DEBUG_LOCKER

diff --git a/stglibs/stg_locker.lib/stg_locker.h b/stglibs/stg_locker.lib/stg_locker.h
index 658336886e2c7969bcfda02e850199e8243edc7a..4621388ee6fd0771e7d51e136133895955d5c232 100644 (file)
--- a/stglibs/stg_locker.lib/stg_locker.h
+++ b/stglibs/stg_locker.lib/stg_locker.h
@@ -29,7 +29,6 @@
 #define STG_LOCKER_H
 
 #include <pthread.h>
 #define STG_LOCKER_H
 
 #include <pthread.h>

-#include "noncopyable.h"

 
 #ifdef DEBUG_LOCKER
 
 
 #ifdef DEBUG_LOCKER
 


@@ -38,6 +37,8 @@
 #include <pthread.h>
 
 #endif
 #include <pthread.h>
 
 #endif

+
+#include "stg/noncopyable.h"

 //-----------------------------------------------------------------------------
 class STG_LOCKER : private NONCOPYABLE
 {
 //-----------------------------------------------------------------------------
 class STG_LOCKER : private NONCOPYABLE
 {

diff --git a/stglibs/stg_logger.lib/stg_logger.h b/stglibs/stg_logger.lib/stg_logger.h
index 3f9eed09aa43242c51fe6990539f8dd391eff0de..f8375b065ca7b2dc657b2aa109369d098d8fb3cc 100644 (file)
--- a/stglibs/stg_logger.lib/stg_logger.h
+++ b/stglibs/stg_logger.lib/stg_logger.h
@@ -2,8 +2,10 @@
 #define STG_LOGGER_H
 
 #include <pthread.h>
 #define STG_LOGGER_H
 
 #include <pthread.h>

+

 #include <string>
 #include <string>

-#include "noncopyable.h"
+
+#include "stg/noncopyable.h"

 
 const char * LogDate(time_t t);
 //-----------------------------------------------------------------------------
 
 const char * LogDate(time_t t);
 //-----------------------------------------------------------------------------