Merge pull request #39189 from touilleMan/issue-38925

Unify OS.get_system_time_* and OS.get_unix_time

1 files changed, 3 insertions, 13 deletions

diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 083cd64116..9a5fc6d1a4 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -163,21 +163,11 @@ String OS_Unix::get_name() const {
 	return "Unix";
 }
 
-uint64_t OS_Unix::get_unix_time() const {
-	return time(nullptr);
-};
-
-uint64_t OS_Unix::get_system_time_secs() const {
-	struct timeval tv_now;
-	gettimeofday(&tv_now, nullptr);
-	return uint64_t(tv_now.tv_sec);
-}
-
-uint64_t OS_Unix::get_system_time_msecs() const {
+double OS_Unix::get_unix_time() const {
 	struct timeval tv_now;
 	gettimeofday(&tv_now, nullptr);
-	return uint64_t(tv_now.tv_sec) * 1000 + uint64_t(tv_now.tv_usec) / 1000;
-}
+	return (double)tv_now.tv_sec + double(tv_now.tv_usec) / 1000000;
+};
 
 OS::Date OS_Unix::get_date(bool utc) const {
 	time_t t = time(nullptr);