mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
Merge pull request #106 from MathiewMay/dev
Fix System::currentTimeMillis() not returning correct numbers.
This commit is contained in:
commit
a79d109675
|
|
@ -101,10 +101,9 @@ __int64 System::currentTimeMillis()
|
||||||
#elif defined(__linux__)
|
#elif defined(__linux__)
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
gettimeofday(&tv, NULL);
|
gettimeofday(&tv, NULL);
|
||||||
long long unix_time = tv.tv_sec;
|
// Convert to milliseconds since unix epoch instead of windows file time
|
||||||
long long file_time = (unix_time + 11644473600LL) * 10000000LL + tv.tv_usec * 10;
|
// time is expecting calculation to be between 10-30 ms.
|
||||||
|
return (int64_t)tv.tv_sec * 1000LL + tv.tv_sec / 1000;
|
||||||
return file_time;
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
SYSTEMTIME UTCSysTime;
|
SYSTEMTIME UTCSysTime;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue