summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-09-10 13:10:23 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-09-10 13:10:23 -0300
commitfad1faddae96454bbe4abfef1bf394b3d2c9c057 (patch)
tree231f884e693149cbddc6459f770f5aaf637ffad1
parent3013a83f2f8b9afdc0301b6a05eadf6d7a49cf74 (diff)
Removing locatime so this function compiles again.
I don't think it has any practical use anyway.
-rw-r--r--drivers/unix/os_unix.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 05af7ee900..96f90e6be1 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;
}