diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-11-12 15:23:36 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-11-12 16:02:35 +0100 |
| commit | 37e47fbdabd6439c022a5fc3b72176aa6c4e569f (patch) | |
| tree | 1b28f12df5c5ea05360fa680293deea1480c16c4 /src/devices/nm-device-ip-tunnel.c | |
| parent | 45e54840dbc099b74078b92d47d78caa46f54f41 (diff) | |
| download | NetworkManager-37e47fbdabd6439c022a5fc3b72176aa6c4e569f.tar.gz | |
build: avoid header conflict for <linux/if.h> and <net/if.h> with "nm-platform.h"
In the past, the headers "linux/if.h" and "net/if.h" were incompatible.
That means, we can either include one or the other, but not both.
This is fixed in the meantime, however the issue still exists when
building against older kernel/glibc.
That means, including one of these headers from a header file
is problematic. In particular if it's a header like "nm-platform.h",
which itself is dragged in by many other headers.
Avoid that by not including these headers from "platform.h", but instead
from the source files where needed (or possibly from less popular header
files).
Currently there is no problem. However, this allows an unknowing user to
include <net/if.h> at the same time with "nm-platform.h", which is easy
to get wrong.
Diffstat (limited to 'src/devices/nm-device-ip-tunnel.c')
| -rw-r--r-- | src/devices/nm-device-ip-tunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 568403c626..1c7e6d51e5 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -27,6 +27,7 @@ #include <linux/if.h> #include <linux/ip.h> #include <linux/if_tunnel.h> +#include <linux/ip6_tunnel.h> #include "nm-device-private.h" #include "nm-manager.h" |