X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2f649fb261c20fad8b6ff48f8ebc1f9bd4f97b86..0a3e4d188472ff4be7948d84a7d0be4c09169da2:/stglibs/common.lib/common.h?ds=sidebyside

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index cd7ab84f..3752822a 100644
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -19,19 +19,23 @@
  */
 
  /*
- $Revision: 1.31 $
- $Date: 2010/11/03 10:26:30 $
+ $Revision: 1.32 $
+ $Date: 2010/11/08 10:11:19 $
  $Author: faust $
  */
 
 #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/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);