about summary refs log tree commit diff
path: root/include/netinet
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-01-06 23:32:52 +0100
committerRich Felker <dalias@aerifal.cx>2018-01-09 13:08:25 -0500
commitb583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc (patch)
tree079331d86387f58b5f20327a379444cf379f988f /include/netinet
parent628cf979b249fa76a80962e2eefe05073216a4db (diff)
downloadmusl-b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc.tar.gz
musl-b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc.tar.xz
musl-b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc.zip
add additional uapi guards for Linux kernel header files
With Linux kernel 4.16 it will be possible to guard more parts of the
Linux header files from a libc. Make use of this in musl to guard all
the structures and other definitions from the Linux header files which
are also defined by the header files provided by musl. This will make
it possible to compile source files which include both the libc
headers and the kernel userspace headers.

This extends the definitions done in commit 04983f227238 ("make
netinet/in.h suppress clashing definitions from kernel headers")
Diffstat (limited to 'include/netinet')
-rw-r--r--include/netinet/if_ether.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
index d9a131aa..97134d75 100644
--- a/include/netinet/if_ether.h
+++ b/include/netinet/if_ether.h
@@ -133,5 +133,6 @@ do { \
 	(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
 } while(0)
 
+#define __UAPI_DEF_ETHHDR       0
 
 #endif