diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-09-10 00:12:05 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-10 00:12:05 -0300 |
| commit | 3013a83f2f8b9afdc0301b6a05eadf6d7a49cf74 (patch) | |
| tree | cd61f668397e48c7349bb53685749202c6edc3b7 /drivers/unix/os_unix.cpp | |
| parent | 0fb7b5aa0c023d60880d259e70f7641152460aa6 (diff) | |
| parent | 4e8dcc8938928864aaab2c70e594dd1f35a40167 (diff) | |
| download | redot-engine-3013a83f2f8b9afdc0301b6a05eadf6d7a49cf74.tar.gz | |
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 | 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; } |