| From 4232a34064e33b52f07cca51b902b93699800f72 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| Date: Mon, 16 Apr 2018 14:45:44 +0200 |
| Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| |
| --- |
| src/systemd/src/systemd/sd-dhcp-client.h | 2 ++ |
| src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++ |
| src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++ |
| src/systemd/src/systemd/sd-ipv4ll.h | 2 ++ |
| 4 files changed, 8 insertions(+) |
| |
| diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h |
| index bd0d429..c935fe1 100644 |
| --- a/src/systemd/src/systemd/sd-dhcp-client.h |
| +++ b/src/systemd/src/systemd/sd-dhcp-client.h |
| @@ -20,7 +20,9 @@ |
| ***/ |
| |
| #include <inttypes.h> |
| +#if defined(__GLIBC__) |
| #include <net/ethernet.h> |
| +#endif |
| #include <netinet/in.h> |
| #include <sys/types.h> |
| #include <stdbool.h> |
| diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h |
| index d299c79..991e67e 100644 |
| --- a/src/systemd/src/systemd/sd-dhcp-lease.h |
| +++ b/src/systemd/src/systemd/sd-dhcp-lease.h |
| @@ -19,7 +19,9 @@ |
| ***/ |
| |
| #include <inttypes.h> |
| +#if defined(__GLIBC__) |
| #include <net/ethernet.h> |
| +#endif |
| #include <netinet/in.h> |
| #include <sys/types.h> |
| |
| diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h |
| index 43d38f5..57ab487 100644 |
| --- a/src/systemd/src/systemd/sd-dhcp6-client.h |
| +++ b/src/systemd/src/systemd/sd-dhcp6-client.h |
| @@ -20,7 +20,9 @@ |
| ***/ |
| |
| #include <inttypes.h> |
| +#if defined(__GLIBC__) |
| #include <net/ethernet.h> |
| +#endif |
| #include <sys/types.h> |
| |
| #include "sd-dhcp6-lease.h" |
| diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h |
| index 71bd4cf..1c667ba 100644 |
| --- a/src/systemd/src/systemd/sd-ipv4ll.h |
| +++ b/src/systemd/src/systemd/sd-ipv4ll.h |
| @@ -19,7 +19,9 @@ |
| along with systemd; If not, see <http://www.gnu.org/licenses/>. |
| ***/ |
| |
| +#if defined(__GLIBC__) |
| #include <net/ethernet.h> |
| +#endif |
| #include <netinet/in.h> |
| |
| #include "sd-event.h" |