blob: 2e04701699c8154153e9137b6dd9c0138d641864 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 1 Mar 2018 18:31:01 -0500
Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
include/uapi/linux/if_ether.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index 153c9c2..7b69b73 100644
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -149,6 +149,12 @@
* This is an Ethernet frame header.
*/
+#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
+
/* allow libcs like musl to deactivate this, glibc does not implement this. */
#ifndef __UAPI_DEF_ETHHDR
#define __UAPI_DEF_ETHHDR 1
--
2.7.4
|
