| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 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 | src/systemd/src/systemd/sd-dhcp-client.h | 2 ++ |
| 14 | src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++ |
| 15 | src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++ |
| 16 | src/systemd/src/systemd/sd-ipv4ll.h | 2 ++ |
| 17 | 4 files changed, 8 insertions(+) |
| 18 | |
| 19 | diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h |
| 20 | index 5e46d8d..18a613f 100644 |
| 21 | --- a/src/systemd/src/systemd/sd-dhcp-client.h |
| 22 | +++ b/src/systemd/src/systemd/sd-dhcp-client.h |
| 23 | @@ -21,7 +21,9 @@ |
| 24 | ***/ |
| 25 | |
| 26 | #include <inttypes.h> |
| 27 | +#if defined(__GLIBC__) |
| 28 | #include <net/ethernet.h> |
| 29 | +#endif |
| 30 | #include <netinet/in.h> |
| 31 | #include <sys/types.h> |
| 32 | |
| 33 | diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h |
| 34 | index 7ab99cc..85acdf2 100644 |
| 35 | --- a/src/systemd/src/systemd/sd-dhcp-lease.h |
| 36 | +++ b/src/systemd/src/systemd/sd-dhcp-lease.h |
| 37 | @@ -22,7 +22,9 @@ |
| 38 | ***/ |
| 39 | |
| 40 | #include <inttypes.h> |
| 41 | +#if defined(__GLIBC__) |
| 42 | #include <net/ethernet.h> |
| 43 | +#endif |
| 44 | #include <netinet/in.h> |
| 45 | #include <sys/types.h> |
| 46 | |
| 47 | diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h |
| 48 | index 7819f0d..35f30ee 100644 |
| 49 | --- a/src/systemd/src/systemd/sd-dhcp6-client.h |
| 50 | +++ b/src/systemd/src/systemd/sd-dhcp6-client.h |
| 51 | @@ -21,7 +21,9 @@ |
| 52 | ***/ |
| 53 | |
| 54 | #include <inttypes.h> |
| 55 | +#if defined(__GLIBC__) |
| 56 | #include <net/ethernet.h> |
| 57 | +#endif |
| 58 | #include <sys/types.h> |
| 59 | |
| 60 | #include "sd-dhcp6-lease.h" |
| 61 | diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h |
| 62 | index 5ba9208..c90eca6 100644 |
| 63 | --- a/src/systemd/src/systemd/sd-ipv4ll.h |
| 64 | +++ b/src/systemd/src/systemd/sd-ipv4ll.h |
| 65 | @@ -20,7 +20,9 @@ |
| 66 | along with systemd; If not, see <http://www.gnu.org/licenses/>. |
| 67 | ***/ |
| 68 | |
| 69 | +#if defined(__GLIBC__) |
| 70 | #include <net/ethernet.h> |
| 71 | +#endif |
| 72 | #include <netinet/in.h> |
| 73 | |
| 74 | #include "sd-event.h" |
| 75 | -- |
| 76 | 2.14.3 |
| 77 | |