From 9a50e01ea66b83ee7b2b122724ea5e3f3df3d8cb Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 15 Nov 2017 18:28:04 +0100 Subject: [PATCH] set_real_time_clock: Change parameter from uint32 to uint64. This should have been done along with the time_t change, but I forgot to check this then. Technically this breaks ABI against BeOS, but: 1. BeOS used an int32, so we'd already slightly broken ABI here 2. Only one thing at HaikuArchives (VMwareAddons) and one recipe at HaikuPorts (samba) uses this function at all. If it turns out some critical BeOS app uses this, then I guess we can enclose GCC2 guards around it, but since I can't find any evidence of that, I'm pushing it without them for now. --- headers/os/kernel/OS.h | 2 +- src/system/kernel/real_time_clock.cpp | 2 +- src/system/libroot/os/time.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h index 30a329059f..0ea55ce01b 100644 --- a/headers/os/kernel/OS.h +++ b/headers/os/kernel/OS.h @@ -374,7 +374,7 @@ extern status_t convert_to_pthread(thread_id thread, pthread_t *_thread); /* Time */ extern uint32 real_time_clock(void); -extern void set_real_time_clock(uint32 secsSinceJan1st1970); +extern void set_real_time_clock(uint64 secsSinceJan1st1970); extern bigtime_t real_time_clock_usecs(void); extern bigtime_t system_time(void); /* time since booting in microseconds */ diff --git a/src/system/kernel/real_time_clock.cpp b/src/system/kernel/real_time_clock.cpp index 8f86578726..bd2faa1e3b 100644 --- a/src/system/kernel/real_time_clock.cpp +++ b/src/system/kernel/real_time_clock.cpp @@ -123,7 +123,7 @@ set_real_time_clock_usecs(bigtime_t currentTime) void -set_real_time_clock(uint32 currentTime) +set_real_time_clock(uint64 currentTime) { set_real_time_clock_usecs((bigtime_t)currentTime * 1000000); } diff --git a/src/system/libroot/os/time.cpp b/src/system/libroot/os/time.cpp index 5ba397bb1c..658ec3f843 100644 --- a/src/system/libroot/os/time.cpp +++ b/src/system/libroot/os/time.cpp @@ -60,7 +60,7 @@ real_time_clock_usecs(void) void -set_real_time_clock(uint32 secs) +set_real_time_clock(uint64 secs) { _kern_set_real_time_clock((bigtime_t)secs * 1000000); }