ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-02 16:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lx_emul: fix conversion warnings on 32bit

Browse Source 
This change is necessary for also supporting 32bit platforms.

Ref genodelabs/genode#4411
This commit is contained in:
Josef Söntgen 2022-01-31 17:45:19 +01:00 committed by Norman Feske
parent 7809b9e8ad
commit 96ca806e0d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_linux/src/include/lx_emul/time.h
View File

@ -24,7 +24,7 @@ void lx_emul_time_event(unsigned long evt);
void lx_emul_time_stop(void); 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); void lx_emul_time_handle(void);

4
repos/dde_linux/src/lib/lx_emul/time.cc
View File

@ -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; return ret;
} }

4
repos/dde_linux/src/lib/lx_kit/console.cc
View File

@ -252,7 +252,7 @@ void Lx_kit::Console::vprintf(const char *format, va_list list)
if (cmd.length == Format_command::LONG_LONG) if (cmd.length == Format_command::LONG_LONG)
_out_signed<long long>(numeric_arg, cmd.base); _out_signed<long long>(numeric_arg, cmd.base);
else else
_out_signed<long>(numeric_arg, cmd.base); _out_signed<long>(static_cast<long>(numeric_arg), cmd.base);
break; break;
case Format_command::UINT: case Format_command::UINT:
@ -270,7 +270,7 @@ void Lx_kit::Console::vprintf(const char *format, va_list list)
case Format_command::PTR: case Format_command::PTR:
_out_unsigned<unsigned long>(numeric_arg, cmd.base, cmd.padding); _out_unsigned<unsigned long>(static_cast<unsigned long>(numeric_arg), cmd.base, cmd.padding);
break; break;
case Format_command::CHAR: case Format_command::CHAR: