X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/16060c9b46a9a84f18629b0234d09144ba68a746..203056055696ed765a66342e7e9e74ba1ffc10a3:/stglibs/common.lib/common.h?ds=sidebyside diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h index 7761d183..3752822a 100644 --- 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 +#else #include +#endif #include -#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);