ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-31 08:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: fix compile error "flexible array ..."

Browse Source 
Fixes #2384
This commit is contained in:
Martin Stein 2017-04-11 12:38:45 +02:00 committed by Christian Helmuth
parent 742293ab87
commit 64fb2865b0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/os/src/server/nic_router/link.cc
View File

@ -37,13 +37,13 @@ constexpr size_t Link_side_id::data_size()
bool Link_side_id::operator == (Link_side_id const &id) const bool Link_side_id::operator == (Link_side_id const &id) const
{ {
return memcmp(id.data, data, data_size()) == 0; return memcmp(id.data_base(), data_base(), data_size()) == 0;
} }
bool Link_side_id::operator > (Link_side_id const &id) const bool Link_side_id::operator > (Link_side_id const &id) const
{ {
return memcmp(id.data, data, data_size()) > 0; return memcmp(id.data_base(), data_base(), data_size()) > 0;
} }

3
repos/os/src/server/nic_router/link.h
View File

@ -42,7 +42,6 @@ namespace Net {
struct Net::Link_side_id struct Net::Link_side_id
{ {
int const data[];
Ipv4_address const src_ip; Ipv4_address const src_ip;
Port const src_port; Port const src_port;
Ipv4_address const dst_ip; Ipv4_address const dst_ip;
@ -50,6 +49,8 @@ struct Net::Link_side_id
static constexpr Genode::size_t data_size(); static constexpr Genode::size_t data_size();
void *data_base() const { return (void *)&src_ip; }
/************************ /************************
** Standard operators ** ** Standard operators **