Split SETTINGS to interface and implementation

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

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index 7761d183ad8c71381d1df116b1ba0f071364be1b..f924867bac7c1afa178ce292527a1d17952e5d3a 100644 (file)
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -27,7 +27,11 @@
 #ifndef common_h
 #define common_h
 
 #ifndef common_h
 #define common_h
 

+#ifdef __BORLANDC__
+#include <time.h>
+#else

 #include <ctime>
 #include <ctime>

+#endif

 #include <string>
 
 #include "os_int.h"
 #include <string>
 
 #include "os_int.h"


@@ -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);
 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);
 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);
 //-----------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s);
 const std::string & x2str(unsigned long x, std::string & s);