diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-07-09 17:25:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-12-23 10:48:26 +0100 |
| commit | 2f9238b987756f101134e35c44bc54b69e0392d7 (patch) | |
| tree | 3a8a1d175084cadc2063bc7d83091108c5b1cf8d | |
| parent | 710e3d98138d96736b036ee55d5e3ebf3d7f9c6f (diff) | |
| download | NetworkManager-2f9238b987756f101134e35c44bc54b69e0392d7.tar.gz | |
systemd: fix include for <linux/if_arp.h> on musl
Due to mixing includes of userspace network headers (net/*) and
kernelspace onces (linux/if*) symbol redefinitions happen on musl.
[thaller@redhat.com: modified original patch]
| -rw-r--r-- | src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c index ec7f1be2e0..42cde93b08 100644 --- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c @@ -7,7 +7,11 @@ #include <errno.h> #include <sys/ioctl.h> +#if 0 /* NM_IGNORED */ #include <linux/if_arp.h> +#else /* NM_IGNORED */ +#include <net/if_arp.h> +#endif /* NM_IGNORED */ #include <linux/if_infiniband.h> #include "sd-dhcp6-client.h" |