X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/56ffdca636bfde338300a1ef6e0114ae1fc0373b..203056055696ed765a66342e7e9e74ba1ffc10a3:/stglibs/common.lib/common.h diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h index 6e957698..3752822a 100644 --- a/stglibs/common.lib/common.h +++ b/stglibs/common.lib/common.h @@ -34,8 +34,8 @@ #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) @@ -221,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);