From 704483df2dab0f376b996e04d5c971e99151f439 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Thu, 7 Apr 2011 18:33:52 +0300
Subject: [PATCH] Fix stglibs compilation errors

---
 stglibs/common.lib/common.h                   | 4 ++--
 stglibs/conffiles.lib/conffiles.cpp           | 2 +-
 stglibs/conffiles.lib/conffiles.h             | 2 +-
 stglibs/crypto.lib/ag_md5.h                   | 4 ++--
 stglibs/crypto.lib/blowfish.cpp               | 4 ++--
 stglibs/crypto.lib/blowfish.h                 | 2 +-
 stglibs/dotconfpp.lib/dotconfpp.h             | 2 +-
 stglibs/dotconfpp.lib/mempool.h               | 2 --
 stglibs/ia_auth_c.lib/ia_auth_c.cpp           | 2 +-
 stglibs/ia_auth_c.lib/ia_auth_c.h             | 4 ++--
 stglibs/pinger.lib/pinger.cpp                 | 4 ++--
 stglibs/pinger.lib/pinger.h                   | 2 +-
 stglibs/script_executer.lib/script_executer.h | 1 -
 stglibs/srvconf.lib/netunit.cpp               | 2 +-
 stglibs/srvconf.lib/netunit.h                 | 3 +--
 stglibs/srvconf.lib/parser.cpp                | 4 ++--
 stglibs/srvconf.lib/servconf.cpp              | 1 +
 stglibs/srvconf.lib/servconf.h                | 4 ++--
 stglibs/stg_locker.lib/stg_locker.cpp         | 1 +
 stglibs/stg_locker.lib/stg_locker.h           | 3 ++-
 stglibs/stg_logger.lib/stg_logger.h           | 4 +++-
 21 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index f924867b..beba4508 100644
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -34,8 +34,8 @@
 #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)
diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index f839f7c5..ea51939a 100644
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -41,7 +41,7 @@
 #include <fstream>
 
 #include "conffiles.h"
-#include "common.h"
+#include "stg/common.h"
 
 using namespace std;
 
diff --git a/stglibs/conffiles.lib/conffiles.h b/stglibs/conffiles.lib/conffiles.h
index ae2c8fd0..6909c6c9 100644
--- a/stglibs/conffiles.lib/conffiles.h
+++ b/stglibs/conffiles.lib/conffiles.h
@@ -35,7 +35,7 @@
 #include <map>
 #include <string>
 
-#include "os_int.h"
+#include "stg/os_int.h"
 
 using namespace std;
 //---------------------------------------------------------------------------
diff --git a/stglibs/crypto.lib/ag_md5.h b/stglibs/crypto.lib/ag_md5.h
index 3b54b502..9a8b16a0 100644
--- a/stglibs/crypto.lib/ag_md5.h
+++ b/stglibs/crypto.lib/ag_md5.h
@@ -1,9 +1,9 @@
 #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];
diff --git a/stglibs/crypto.lib/blowfish.cpp b/stglibs/crypto.lib/blowfish.cpp
index ab3122b9..e9d2bde4 100644
--- a/stglibs/crypto.lib/blowfish.cpp
+++ b/stglibs/crypto.lib/blowfish.cpp
@@ -5,10 +5,10 @@
  * Description:  C implementation of the Blowfish algorithm.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "blowfish.h"
-#include "stg_const.h"
+#include "stg/stg_const.h"
 
 /*typedef struct _BCoptions
     {
diff --git a/stglibs/crypto.lib/blowfish.h b/stglibs/crypto.lib/blowfish.h
index e0cf2068..45d92110 100644
--- a/stglibs/crypto.lib/blowfish.h
+++ b/stglibs/crypto.lib/blowfish.h
@@ -8,7 +8,7 @@
 #ifndef BLOWFISH_H
 #define BLOWFISH_H
 
-#include "os_int.h"
+#include "stg/os_int.h"
 
 #define MAXKEYBYTES 56          /* 448 bits */
 
diff --git a/stglibs/dotconfpp.lib/dotconfpp.h b/stglibs/dotconfpp.lib/dotconfpp.h
index 67835fb8..8c2a82ad 100644
--- a/stglibs/dotconfpp.lib/dotconfpp.h
+++ b/stglibs/dotconfpp.lib/dotconfpp.h
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "os_int.h"
+#include "stg/os_int.h"
 
 typedef void (* DOTCONFCallback) (void * data, const char * buf);
 
diff --git a/stglibs/dotconfpp.lib/mempool.h b/stglibs/dotconfpp.lib/mempool.h
index 73b3c4c3..9975611d 100644
--- 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
 
-#include "os_int.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 b5eb4ddc..075a1913 100644
--- 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 "common.h"
+#include "stg/common.h"
 #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 1a1ea039..0a916f4c 100644
--- 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 "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)
diff --git a/stglibs/pinger.lib/pinger.cpp b/stglibs/pinger.lib/pinger.cpp
index a33f810b..68137d7c 100644
--- a/stglibs/pinger.lib/pinger.cpp
+++ b/stglibs/pinger.lib/pinger.cpp
@@ -15,8 +15,8 @@
 #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;
diff --git a/stglibs/pinger.lib/pinger.h b/stglibs/pinger.lib/pinger.h
index f1f442e1..b1b77781 100644
--- a/stglibs/pinger.lib/pinger.h
+++ b/stglibs/pinger.lib/pinger.h
@@ -27,7 +27,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "os_int.h"
+#include "stg/os_int.h"
 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR
diff --git a/stglibs/script_executer.lib/script_executer.h b/stglibs/script_executer.lib/script_executer.h
index 19d458e3..12ba0999 100644
--- 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>
-#include <sys/types.h>
 
 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 bcfc113e..7f304e2a 100644
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -33,7 +33,7 @@
 #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 91218b18..e288df86 100644
--- a/stglibs/srvconf.lib/netunit.h
+++ b/stglibs/srvconf.lib/netunit.h
@@ -34,8 +34,7 @@
 #include <list>
 #include <string>
 
-#include "common.h"
-#include "blowfish.h"
+#include "stg/blowfish.h"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
diff --git a/stglibs/srvconf.lib/parser.cpp b/stglibs/srvconf.lib/parser.cpp
index 9373952e..d7c7568f 100644
--- a/stglibs/srvconf.lib/parser.cpp
+++ b/stglibs/srvconf.lib/parser.cpp
@@ -33,8 +33,8 @@
 #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;
diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a7cac13c..a28e2e86 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -27,6 +27,7 @@
 #include <cstdio>
 #include <cstring>
 
+#include "stg/common.h"
 #include "servconf.h"
 
 using namespace std;
diff --git a/stglibs/srvconf.lib/servconf.h b/stglibs/srvconf.lib/servconf.h
index a58d2952..a2a74081 100644
--- a/stglibs/srvconf.lib/servconf.h
+++ b/stglibs/srvconf.lib/servconf.h
@@ -32,9 +32,9 @@
 #include <list>
 #include <string>
 
-#include "os_int.h"
+#include "stg/os_int.h"
+#include "stg/stg_const.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);
diff --git a/stglibs/stg_locker.lib/stg_locker.cpp b/stglibs/stg_locker.lib/stg_locker.cpp
index be0aa006..0f4007cc 100644
--- a/stglibs/stg_locker.lib/stg_locker.cpp
+++ b/stglibs/stg_locker.lib/stg_locker.cpp
@@ -27,6 +27,7 @@
 
 
 #include <pthread.h>
+
 #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 65833688..4621388e 100644
--- 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>
-#include "noncopyable.h"
 
 #ifdef DEBUG_LOCKER
 
@@ -38,6 +37,8 @@
 #include <pthread.h>
 
 #endif
+
+#include "stg/noncopyable.h"
 //-----------------------------------------------------------------------------
 class STG_LOCKER : private NONCOPYABLE
 {
diff --git a/stglibs/stg_logger.lib/stg_logger.h b/stglibs/stg_logger.lib/stg_logger.h
index 3f9eed09..f8375b06 100644
--- 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>
+
 #include <string>
-#include "noncopyable.h"
+
+#include "stg/noncopyable.h"
 
 const char * LogDate(time_t t);
 //-----------------------------------------------------------------------------
-- 
2.44.2