diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-09-09 18:52:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-09 18:52:47 -0300 |
| commit | 4e8dcc8938928864aaab2c70e594dd1f35a40167 (patch) | |
| tree | d35c176121eb8b4d1446fb9a888550b107e883d5 /drivers | |
| parent | 97413746173b4f872e8c72eba0e58d7092a93269 (diff) | |
| parent | e3e93da6b94cdf14e9a6f466cf5f50a857166928 (diff) | |
| download | redot-engine-4e8dcc8938928864aaab2c70e594dd1f35a40167.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 314e13cee4..05af7ee900 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -226,7 +226,8 @@ 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); + //localtime(&tv_now.tv_usec); + localtime((const long *)&tv_now.tv_usec); uint64_t msec = tv_now.tv_usec/1000; return msec; } |