diff options
| author | Andrei Vagin <avagin@google.com> | 2019-01-22 11:48:24 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-01-22 11:49:36 -0800 |
| commit | ceb3dcfb72fe050bb0d90a7285cd1b56d1b4dfeb (patch) | |
| tree | a5ef82ea674ae0cdfe48b487189c804d82139095 | |
| parent | c1be25b78d89a3a55a32a7aa10724134eda9813d (diff) | |
gvisor/test: fix a compile time error in socket_netdevice
Compilation of this test fails in kokoro:
In file included from /usr/include/linux/netdevice.h:28:0,
from /usr/include/linux/if_arp.h:26,
from ./test/syscalls/linux/socket_netlink_util.h:18,
from test/syscalls/linux/socket_netdevice.cc:24:
/usr/include/linux/if.h:143:8: error: redefinition of 'struct ifmap'
struct ifmap {
^~~~~
In file included from test/syscalls/linux/socket_netdevice.cc:18:0:
/usr/include/net/if.h:111:8: note: previous definition of 'struct ifmap'
struct ifmap
^~~~~
In file included from /usr/include/linux/netdevice.h:28:0,
from /usr/include/linux/if_arp.h:26,
from ./test/syscalls/linux/socket_netlink_util.h:18,
from test/syscalls/linux/socket_netdevice.cc:24:
/usr/include/linux/if.h:177:8: error: redefinition of 'struct ifreq'
struct ifreq {
^~~~~
In file included from test/syscalls/linux/socket_netdevice.cc:18:0:
/usr/include/net/if.h:126:8: note: previous definition of 'struct ifreq'
struct ifreq
^~~~~
In file included from /usr/include/linux/netdevice.h:28:0,
from /usr/include/linux/if_arp.h:26,
from ./test/syscalls/linux/socket_netlink_util.h:18,
from test/syscalls/linux/socket_netdevice.cc:24:
/usr/include/linux/if.h:226:8: error: redefinition of 'struct ifconf'
struct ifconf {
^~~~~~
In file included from test/syscalls/linux/socket_netdevice.cc:18:0:
/usr/include/net/if.h:176:8: note: previous definition of 'struct ifconf'
struct ifconf
PiperOrigin-RevId: 230381931
Change-Id: I3c422c53e50cf2b90022778599d3a8a4a61fd1a3
| -rw-r--r-- | test/syscalls/linux/socket_netdevice.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/syscalls/linux/socket_netdevice.cc b/test/syscalls/linux/socket_netdevice.cc index 7bfb62a6f..b4e9fe51b 100644 --- a/test/syscalls/linux/socket_netdevice.cc +++ b/test/syscalls/linux/socket_netdevice.cc @@ -15,7 +15,6 @@ #include <linux/netlink.h> #include <linux/rtnetlink.h> #include <linux/sockios.h> -#include <net/if.h> #include <sys/ioctl.h> #include <sys/socket.h> |