Fix rscriptd compilation errors

[stg.git] / stglibs / common.lib / common.h

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index 7761d183ad8c71381d1df116b1ba0f071364be1b..beba4508dd96b2070087a51b019fca4e3210bc1e 100644 (file)
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -27,11 +27,15 @@
 #ifndef common_h
 #define common_h
 
+#ifdef __BORLANDC__
+#include <time.h>
+#else
 #include <ctime>
+#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)
@@ -217,8 +221,10 @@ int str2x(const std::string & str, int & x);
 int str2x(const std::string & str, unsigned & x);
 int str2x(const std::string & str, long & x);
 int str2x(const std::string & str, unsigned long & x);
+#ifndef WIN32
 int str2x(const std::string & str, long long & x);
 int str2x(const std::string & str, unsigned long long & x);
+#endif
 //-----------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s);
 const std::string & x2str(unsigned long x, std::string & s);