From e1e7ab178f37db749bb50fe286969f365aa1e17f Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 19 Oct 2012 11:36:01 +0200 Subject: [PATCH] Resolve ambigiouties of size_t When building in hybrid Linux/Genode mode, there exist two definitions of 'size_t', one in the 'Genode' namespace and one imported from the glibc headers. --- base-linux/src/base/ipc/ipc.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/base-linux/src/base/ipc/ipc.cc b/base-linux/src/base/ipc/ipc.cc index 8ca8aea6c..8017e788b 100644 --- a/base-linux/src/base/ipc/ipc.cc +++ b/base-linux/src/base/ipc/ipc.cc @@ -76,6 +76,8 @@ static int lookup_tid_by_client_socket(int sd) struct Prefix_len { + typedef Genode::size_t size_t; + size_t const len; static int _init_len(char const *s) @@ -124,6 +126,8 @@ namespace { private: + typedef Genode::size_t size_t; + msghdr _msg; sockaddr_un _addr; iovec _iovec; @@ -226,7 +230,7 @@ static void extract_sds_from_message(unsigned start_index, Message const &msg, * Send request to server and wait for reply */ static inline void lx_call(int dst_sd, - Genode::Msgbuf_base &send_msgbuf, size_t send_msg_len, + Genode::Msgbuf_base &send_msgbuf, Genode::size_t send_msg_len, Genode::Msgbuf_base &recv_msgbuf) { int ret; @@ -308,7 +312,7 @@ static inline int lx_wait(Genode::Native_connection_state &cs, */ static inline void lx_reply(int reply_socket, Genode::Msgbuf_base &send_msgbuf, - size_t msg_len) + Genode::size_t msg_len) { Message msg(send_msgbuf.buf, msg_len);