Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 1a4b7ee28bf7413af6513fb45ad0d0736048f866 / . / meta-openembedded / meta-networking / recipes-connectivity / networkmanager / networkmanager / musl / 0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
blob: 6bca95e189cafaf4523711d8d487682a821b2c9a [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]1From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 16 Apr 2018 14:45:44 +0200
4Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Pending
10
11Signed-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
19diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]20index e388552..9c4dde8 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]21--- a/src/systemd/src/systemd/sd-dhcp-client.h
22+++ b/src/systemd/src/systemd/sd-dhcp-client.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]23@@ -20,7 +20,9 @@
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]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
33diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]34index 2a60145..19d1814 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]35--- a/src/systemd/src/systemd/sd-dhcp-lease.h
36+++ b/src/systemd/src/systemd/sd-dhcp-lease.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]37@@ -19,7 +19,9 @@
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]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
47diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]48index fa36dca..2d25010 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]49--- a/src/systemd/src/systemd/sd-dhcp6-client.h
50+++ b/src/systemd/src/systemd/sd-dhcp6-client.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]51@@ -20,7 +20,9 @@
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]52 ***/
53
54 #include <inttypes.h>
55+#if defined(__GLIBC__)
56 #include <net/ethernet.h>
57+#endif
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]58 #include <stdbool.h>
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]59 #include <sys/types.h>
60
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]61diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]62index 71bd4cf..1c667ba 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]63--- a/src/systemd/src/systemd/sd-ipv4ll.h
64+++ b/src/systemd/src/systemd/sd-ipv4ll.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]65@@ -19,7 +19,9 @@
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]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--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]762.14.5
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]77