diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-01-03 21:47:45 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-01-03 21:47:45 +0100 |
| commit | 682569741ad2cff260affde940be9101bc004e57 (patch) | |
| tree | d4f5d3630c69b3d0ab18915319a06d71e5ade4a9 /executor/common_linux.h | |
| parent | 9c216c01829f7a67c5fd7ddf50be46a79cab7663 (diff) | |
executor: fix IPVLAN_F_VEPA definition again
Now other machines failed with redefinition IPVLAN_F_VEPA.
The #ifndef does not really work the way it should due
to the way pkg/csource preprocesses sources.
IPVLAN_F_VEPA is never defined during preprocessing.
Let's try this.
Diffstat (limited to 'executor/common_linux.h')
| -rw-r--r-- | executor/common_linux.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index bfc4788c7..618425bed 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -319,9 +319,8 @@ static void netlink_add_macvlan(struct nlmsg* nlmsg, int sock, const char* name, #define IFLA_IPVLAN_FLAGS 2 #define IPVLAN_MODE_L3S 2 -#ifndef IPVLAN_F_VEPA +#undef IPVLAN_F_VEPA #define IPVLAN_F_VEPA 2 -#endif static void netlink_add_ipvlan(struct nlmsg* nlmsg, int sock, const char* name, const char* link, uint16 mode, uint16 flags) { |