diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-10-13 05:01:54 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-10-13 05:01:54 +0300 |
| commit | 29caf2bb5be061cd1ab014cf938f2c71d0bd2663 (patch) | |
| tree | 859a0c3d2805198672c1e22d4780c3eb68f55a57 /drivers/unix/os_unix.cpp | |
| parent | c5f574b914b3cb11d97ae616df4a0bced45bb17c (diff) | |
| parent | 79e5ced7e668fa53567ac6aaf5a26393cea6c9a2 (diff) | |
| download | redot-engine-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 314e13cee4..96f90e6be1 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -226,8 +226,9 @@ uint64_t OS_Unix::get_unix_time() const { uint64_t OS_Unix::get_system_time_msec() const { struct timeval tv_now; gettimeofday(&tv_now, NULL); - localtime(&tv_now.tv_usec); - uint64_t msec = tv_now.tv_usec/1000; + //localtime(&tv_now.tv_usec); + //localtime((const long *)&tv_now.tv_usec); + uint64_t msec = uint64_t(tv_now.tv_sec)*1000+tv_now.tv_usec/1000; return msec; } |