diff --git a/os/include/loader_session/client.h b/os/include/loader_session/client.h index fcd12e929..131321680 100644 --- a/os/include/loader_session/client.h +++ b/os/include/loader_session/client.h @@ -26,13 +26,13 @@ namespace Loader { explicit Session_client(Loader::Session_capability session) : Rpc_client(session) { } - Dataspace_capability alloc_rom_module(Name const &name, Genode::size_t size) { + Dataspace_capability alloc_rom_module(Name const &name, size_t size) { return call(name, size); } void commit_rom_module(Name const &name) { call(name); } - void ram_quota(Genode::size_t quantum) { + void ram_quota(size_t quantum) { call(quantum); } void constrain_geometry(int width, int height) { diff --git a/os/include/loader_session/connection.h b/os/include/loader_session/connection.h index 2af34ce6c..1f3522a48 100644 --- a/os/include/loader_session/connection.h +++ b/os/include/loader_session/connection.h @@ -22,7 +22,7 @@ namespace Loader { struct Connection : Genode::Connection, Session_client { - Connection(Genode::size_t ram_quota) + Connection(size_t ram_quota) : Genode::Connection(session("ram_quota=%zd", ram_quota)), Session_client(cap()) diff --git a/os/include/loader_session/loader_session.h b/os/include/loader_session/loader_session.h index fe6f41359..5f4c37153 100644 --- a/os/include/loader_session/loader_session.h +++ b/os/include/loader_session/loader_session.h @@ -28,6 +28,12 @@ namespace Loader { struct Session : Genode::Session { + /* + * Resolve ambiguity of 'size_t' type when using 'loader_session.h' + * together with libc headers. + */ + typedef Genode::size_t size_t; + /* * Exception types */ @@ -69,8 +75,7 @@ namespace Loader { * becomes visible. The server frees intermediate dataspaces that are * no longer used. */ - virtual Dataspace_capability alloc_rom_module(Name const &name, - Genode::size_t size) = 0; + virtual Dataspace_capability alloc_rom_module(Name const &name, size_t size) = 0; /** * Expose ROM module to loaded subsystem @@ -92,7 +97,7 @@ namespace Loader { * If 'ram_quota' is not called prior calling 'start', all available * session resources will be assigned to the subsystem. */ - virtual void ram_quota(Genode::size_t quantum) = 0; + virtual void ram_quota(size_t quantum) = 0; /** * Constrain size of the nitpicker buffer used by the subsystem @@ -135,11 +140,11 @@ namespace Loader { *******************/ GENODE_RPC(Rpc_alloc_rom_module, Dataspace_capability, alloc_rom_module, - Name const &, Genode::size_t); + Name const &, size_t); GENODE_RPC_THROW(Rpc_commit_rom_module, void, commit_rom_module, GENODE_TYPE_LIST(Rom_module_does_not_exist), Name const &); - GENODE_RPC(Rpc_ram_quota, void, ram_quota, Genode::size_t); + GENODE_RPC(Rpc_ram_quota, void, ram_quota, size_t); GENODE_RPC(Rpc_constrain_geometry, void, constrain_geometry, int, int); GENODE_RPC(Rpc_view_ready_sigh, void, view_ready_sigh, Signal_context_capability); GENODE_RPC_THROW(Rpc_start, void, start,