libc-compat.h: prevent redefinition of struct ethhdr

sabotage-linux · Jan 22, 2014 · 4ffbb51 · 4ffbb51
1 parent 3cd5b95
commit 4ffbb51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/generic/include/linux/if_ether.h b/generic/include/linux/if_ether.h
@@ -22,6 +22,7 @@
 #define _LINUX_IF_ETHER_H
 
 #include <linux/types.h>
+#include <linux/libc-compat.h>
 
 /*
  *	IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
@@ -130,11 +131,12 @@
  *	This is an Ethernet frame header.
  */
 
+#if __UAPI_DEF_ETHHDR
 struct ethhdr {
 	unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/
 	unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/
 	__be16		h_proto;		/* packet type ID field	*/
 } __attribute__((packed));
-
+#endif
 
 #endif /* _LINUX_IF_ETHER_H */
diff --git a/generic/include/linux/libc-compat.h b/generic/include/linux/libc-compat.h
@@ -50,6 +50,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 netinet/in.h header. */
 #if defined(_NETINET_IN_H)