ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Norman Feske 2012-10-19 11:36:01 +02:00
parent db2b1a37ae
commit e1e7ab178f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base-linux/src/base/ipc/ipc.cc
View File

@ -76,6 +76,8 @@ static int lookup_tid_by_client_socket(int sd)
struct Prefix_len struct Prefix_len
{ {
typedef Genode::size_t size_t;
size_t const len; size_t const len;
static int _init_len(char const *s) static int _init_len(char const *s)
@ -124,6 +126,8 @@ namespace {
private: private:
typedef Genode::size_t size_t;
msghdr _msg; msghdr _msg;
sockaddr_un _addr; sockaddr_un _addr;
iovec _iovec; 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 * Send request to server and wait for reply
*/ */
static inline void lx_call(int dst_sd, 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) Genode::Msgbuf_base &recv_msgbuf)
{ {
int ret; int ret;
@ -308,7 +312,7 @@ static inline int lx_wait(Genode::Native_connection_state &cs,
*/ */
static inline void lx_reply(int reply_socket, static inline void lx_reply(int reply_socket,
Genode::Msgbuf_base &send_msgbuf, Genode::Msgbuf_base &send_msgbuf,
size_t msg_len) Genode::size_t msg_len)
{ {
Message msg(send_msgbuf.buf, msg_len); Message msg(send_msgbuf.buf, msg_len);