X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a5bb534ab656e9eaab163c22df0325d3baa3ce40..722a4fd38336dab14e00cb60c9e0c17867a0240e:/stglibs/common.lib/common.h diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h index 904c6e47..f924867b 100644 --- a/stglibs/common.lib/common.h +++ b/stglibs/common.lib/common.h @@ -19,15 +19,19 @@ */ /* - $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 +#else #include +#endif #include #include "os_int.h" @@ -217,10 +221,13 @@ 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); const std::string & x2str(unsigned long long x, std::string & s); //----------------------------------------------------------------------------- char * stg_strptime(const char *, const char *, struct tm *);