From 96ca806e0daeff4501b75129e40b9e725cf46edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Mon, 31 Jan 2022 17:45:19 +0100 Subject: [PATCH] lx_emul: fix conversion warnings on 32bit This change is necessary for also supporting 32bit platforms. Ref genodelabs/genode#4411 --- repos/dde_linux/src/include/lx_emul/time.h | 2 +- repos/dde_linux/src/lib/lx_emul/time.cc | 4 ++-- repos/dde_linux/src/lib/lx_kit/console.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repos/dde_linux/src/include/lx_emul/time.h b/repos/dde_linux/src/include/lx_emul/time.h index 00ef1f41bc..7f560b75c0 100644 --- a/repos/dde_linux/src/include/lx_emul/time.h +++ b/repos/dde_linux/src/include/lx_emul/time.h @@ -24,7 +24,7 @@ void lx_emul_time_event(unsigned long evt); void lx_emul_time_stop(void); -unsigned long lx_emul_time_counter(void); +unsigned long long lx_emul_time_counter(void); void lx_emul_time_handle(void); diff --git a/repos/dde_linux/src/lib/lx_emul/time.cc b/repos/dde_linux/src/lib/lx_emul/time.cc index 3fc8ca17cd..c10962b0fc 100644 --- a/repos/dde_linux/src/lib/lx_emul/time.cc +++ b/repos/dde_linux/src/lib/lx_emul/time.cc @@ -29,8 +29,8 @@ extern "C" void lx_emul_time_stop() } -extern "C" unsigned long lx_emul_time_counter() +extern "C" unsigned long long lx_emul_time_counter() { - unsigned long ret = Lx_kit::env().timer.curr_time().trunc_to_plain_us().value; + unsigned long long ret = Lx_kit::env().timer.curr_time().trunc_to_plain_us().value; return ret; } diff --git a/repos/dde_linux/src/lib/lx_kit/console.cc b/repos/dde_linux/src/lib/lx_kit/console.cc index a14124832e..4a83018139 100644 --- a/repos/dde_linux/src/lib/lx_kit/console.cc +++ b/repos/dde_linux/src/lib/lx_kit/console.cc @@ -252,7 +252,7 @@ void Lx_kit::Console::vprintf(const char *format, va_list list) if (cmd.length == Format_command::LONG_LONG) _out_signed(numeric_arg, cmd.base); else - _out_signed(numeric_arg, cmd.base); + _out_signed(static_cast(numeric_arg), cmd.base); break; case Format_command::UINT: @@ -270,7 +270,7 @@ void Lx_kit::Console::vprintf(const char *format, va_list list) case Format_command::PTR: - _out_unsigned(numeric_arg, cmd.base, cmd.padding); + _out_unsigned(static_cast(numeric_arg), cmd.base, cmd.padding); break; case Format_command::CHAR: