mirror of
https://git.yoctoproject.org/poky
synced 2026-04-24 03:32:13 +02:00
9c3b84d5ee
(From OE-Core rev: ef96628d850f1154c7e59bca418ef3a7c9a2bcc1) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001
|
|
From: rofl0r <retnyg@gmx.net>
|
|
Date: Wed, 22 Jan 2014 00:57:48 +0100
|
|
Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr
|
|
|
|
---
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Submitted
|
|
|
|
include/uapi/linux/if_ether.h | 4 +++-
|
|
include/uapi/linux/libc-compat.h | 6 ++++++
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
Index: linux-4.15/include/uapi/linux/libc-compat.h
|
|
===================================================================
|
|
--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500
|
|
+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500
|
|
@@ -51,6 +51,12 @@
|
|
|
|
#ifndef __KERNEL__ /* we're used from userspace */
|
|
|
|
+#ifdef _NETINET_IF_ETHER_H /* musl */
|
|
+#define __UAPI_DEF_ETHHDR 0
|
|
+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
|
|
+#define __UAPI_DEF_ETHHDR 1
|
|
+#endif
|
|
+
|
|
/* Coordinate with libc net/if.h header. */
|
|
#if defined(_NET_IF_H)
|
|
|