X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/16060c9b46a9a84f18629b0234d09144ba68a746..463995e9899beaf6fa381d68d8050b2c449142ff:/stglibs/common.lib/common.h?ds=sidebyside diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h index 7761d183..f924867b 100644 --- a/stglibs/common.lib/common.h +++ b/stglibs/common.lib/common.h @@ -27,7 +27,11 @@ #ifndef common_h #define common_h +#ifdef __BORLANDC__ +#include +#else #include +#endif #include #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); +#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);