diff options
| author | Juan Linietsky | 2015-09-10 20:31:34 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-09-10 20:31:34 -0300 |
| commit | c7426717d38de36795906cb4f7c2c0297f88a7b3 (patch) | |
| tree | e3f347224f1357997bddd469a85a4c302f768b61 /drivers/unix/os_unix.cpp | |
| parent | 83b69f8fefcc91a1d71b726e7a02623b21386f2b (diff) | |
| parent | 59e1ad27731e66c58a3d5ee9d783eac74a1d48d9 (diff) | |
| download | godot-c7426717d38de36795906cb4f7c2c0297f88a7b3.tar.gz godot-c7426717d38de36795906cb4f7c2c0297f88a7b3.tar.zst godot-c7426717d38de36795906cb4f7c2c0297f88a7b3.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 05af7ee90..96f90e6be 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -227,8 +227,8 @@ uint64_t OS_Unix::get_system_time_msec() const { struct timeval tv_now; gettimeofday(&tv_now, NULL); //localtime(&tv_now.tv_usec); - localtime((const long *)&tv_now.tv_usec); - uint64_t msec = tv_now.tv_usec/1000; + //localtime((const long *)&tv_now.tv_usec); + uint64_t msec = uint64_t(tv_now.tv_sec)*1000+tv_now.tv_usec/1000; return msec; } |