From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Tue, 11 Jun 2019 01:48:01 -0500 Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever, but removing it breaks glibc's userspace header, which includes kernel.h instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical mistake. on musl, including any header that uses kernel.h directly or indirectly plus sys/sysinfo.h will produce a compile error due to redefinition of struct sysinfo. so for now, only include it on glibc in order not to break their headers. Signed-off-by: Jory Pratt --- include/uapi/linux/kernel.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h index d99ffa1..f917115 100644 --- a/include/uapi/linux/kernel.h +++ b/include/uapi/linux/kernel.h @@ -2,7 +2,9 @@ #ifndef _LINUX_KERNEL_H #define _LINUX_KERNEL_H +#ifdef __GLIBC__ #include +#endif /* * 'kernel.h' contains some often-used function prototypes etc -- 2.22.0