diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-06 23:32:52 +0100 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-01-09 13:08:25 -0500 |
| commit | b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc (patch) | |
| tree | 079331d86387f58b5f20327a379444cf379f988f | |
| parent | 628cf979b249fa76a80962e2eefe05073216a4db (diff) | |
| download | musl-b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc.tar.gz musl-b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc.tar.bz2 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")
| -rw-r--r-- | include/net/if.h | 7 | ||||
| -rw-r--r-- | include/netinet/if_ether.h | 1 | ||||
| -rw-r--r-- | include/sys/xattr.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/include/net/if.h b/include/net/if.h index 2f2fcc10..774cbff0 100644 --- a/include/net/if.h +++ b/include/net/if.h @@ -125,6 +125,13 @@ struct ifconf { #define ifc_req ifc_ifcu.ifcu_req #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) +#define __UAPI_DEF_IF_IFCONF 0 +#define __UAPI_DEF_IF_IFMAP 0 +#define __UAPI_DEF_IF_IFNAMSIZ 0 +#define __UAPI_DEF_IF_IFREQ 0 +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + #endif #ifdef __cplusplus 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 diff --git a/include/sys/xattr.h b/include/sys/xattr.h index 6479fcc6..eeeaafc4 100644 --- a/include/sys/xattr.h +++ b/include/sys/xattr.h @@ -24,6 +24,8 @@ int removexattr(const char *, const char *); int lremovexattr(const char *, const char *); int fremovexattr(int, const char *); +#define __UAPI_DEF_XATTR 0 + #ifdef __cplusplus } #endif |