code.ossystems Code Review - openembedded-core.git/blob

   1 From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001
   2 From: rofl0r <retnyg@gmx.net>
   3 Date: Wed, 22 Jan 2014 00:57:48 +0100
   4 Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr
   5
   6 ---
   7 Signed-off-by: Khem Raj <raj.khem@gmail.com>
   8 Upstream-Status: Submitted
   9
  10  include/uapi/linux/if_ether.h    | 4 +++-
  11  include/uapi/linux/libc-compat.h | 6 ++++++
  12  2 files changed, 9 insertions(+), 1 deletion(-)
  13
  14 Index: linux-4.15/include/uapi/linux/libc-compat.h
  15 ===================================================================
  16 --- linux-4.15.orig/include/uapi/linux/libc-compat.h    2018-02-05 17:40:42.338370731 -0500
  17 +++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500
  18 @@ -51,6 +51,12 @@
  19
  20  #ifndef __KERNEL__ /* we're used from userspace */
  21
  22 +#ifdef _NETINET_IF_ETHER_H /* musl */
  23 +#define __UAPI_DEF_ETHHDR 0
  24 +#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
  25 +#define __UAPI_DEF_ETHHDR 1
  26 +#endif
  27 +
  28  /* Coordinate with libc net/if.h header. */
  29  #if defined(_NET_IF_H)
  30