| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 4232a34064e33b52f07cca51b902b93699800f72 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Mon, 16 Apr 2018 14:45:44 +0200 |
| 4 | Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 12 | |
| 13 | --- |
| 14 | src/systemd/src/systemd/sd-dhcp-client.h | 2 ++ |
| 15 | src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++ |
| 16 | src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++ |
| 17 | src/systemd/src/systemd/sd-ipv4ll.h | 2 ++ |
| 18 | 4 files changed, 8 insertions(+) |
| 19 | |
| 20 | diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h |
| 21 | index bd0d429..c935fe1 100644 |
| 22 | --- a/src/systemd/src/systemd/sd-dhcp-client.h |
| 23 | +++ b/src/systemd/src/systemd/sd-dhcp-client.h |
| 24 | @@ -20,7 +20,9 @@ |
| 25 | ***/ |
| 26 | |
| 27 | #include <inttypes.h> |
| 28 | +#if defined(__GLIBC__) |
| 29 | #include <net/ethernet.h> |
| 30 | +#endif |
| 31 | #include <netinet/in.h> |
| 32 | #include <sys/types.h> |
| 33 | #include <stdbool.h> |
| 34 | diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h |
| 35 | index d299c79..991e67e 100644 |
| 36 | --- a/src/systemd/src/systemd/sd-dhcp-lease.h |
| 37 | +++ b/src/systemd/src/systemd/sd-dhcp-lease.h |
| 38 | @@ -19,7 +19,9 @@ |
| 39 | ***/ |
| 40 | |
| 41 | #include <inttypes.h> |
| 42 | +#if defined(__GLIBC__) |
| 43 | #include <net/ethernet.h> |
| 44 | +#endif |
| 45 | #include <netinet/in.h> |
| 46 | #include <sys/types.h> |
| 47 | |
| 48 | diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h |
| 49 | index 43d38f5..57ab487 100644 |
| 50 | --- a/src/systemd/src/systemd/sd-dhcp6-client.h |
| 51 | +++ b/src/systemd/src/systemd/sd-dhcp6-client.h |
| 52 | @@ -20,7 +20,9 @@ |
| 53 | ***/ |
| 54 | |
| 55 | #include <inttypes.h> |
| 56 | +#if defined(__GLIBC__) |
| 57 | #include <net/ethernet.h> |
| 58 | +#endif |
| 59 | #include <sys/types.h> |
| 60 | |
| 61 | #include "sd-dhcp6-lease.h" |
| 62 | diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h |
| 63 | index 71bd4cf..1c667ba 100644 |
| 64 | --- a/src/systemd/src/systemd/sd-ipv4ll.h |
| 65 | +++ b/src/systemd/src/systemd/sd-ipv4ll.h |
| 66 | @@ -19,7 +19,9 @@ |
| 67 | along with systemd; If not, see <http://www.gnu.org/licenses/>. |
| 68 | ***/ |
| 69 | |
| 70 | +#if defined(__GLIBC__) |
| 71 | #include <net/ethernet.h> |
| 72 | +#endif |
| 73 | #include <netinet/in.h> |
| 74 | |
| 75 | #include "sd-event.h" |