mailing list of musl libc
 help / color / mirror / code / Atom feed
* [musl] [PATCH 1/1] linux/sysinfo.h: Add guarder for struct sysinfo
@ 2020-09-30 21:46 Petr Vorel
  2020-09-30 23:42 ` Rich Felker
  0 siblings, 1 reply; 3+ messages in thread
From: Petr Vorel @ 2020-09-30 21:46 UTC (permalink / raw)
  To: linux-kernel; +Cc: Petr Vorel, David S. Miller, Michal Kubecek, musl

for all but glibc libc.

This fixes redefinition on MUSL which also defines struct sysinfo when
including <linux/netlink.h> (which includes <linux/sysinfo.h> via
<linux/kernel.h>) and <sys/sysinfo.h>.

glibc loads <linux/sysinfo.h> in <sys/sysinfo.h>.

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 include/uapi/linux/sysinfo.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/uapi/linux/sysinfo.h b/include/uapi/linux/sysinfo.h
index 435d5c23f0c0..c8ab18cd36b2 100644
--- a/include/uapi/linux/sysinfo.h
+++ b/include/uapi/linux/sysinfo.h
@@ -5,6 +5,8 @@
 #include <linux/types.h>
 
 #define SI_LOAD_SHIFT	16
+
+#if defined(__KERNEL__) || defined(__GLIBC__)
 struct sysinfo {
 	__kernel_long_t uptime;		/* Seconds since boot */
 	__kernel_ulong_t loads[3];	/* 1, 5, and 15 minute load averages */
@@ -21,5 +23,6 @@ struct sysinfo {
 	__u32 mem_unit;			/* Memory unit size in bytes */
 	char _f[20-2*sizeof(__kernel_ulong_t)-sizeof(__u32)];	/* Padding: libc5 uses this.. */
 };
+#endif
 
 #endif /* _LINUX_SYSINFO_H */
-- 
2.27.0.rc0


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-10-01  5:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-30 21:46 [musl] [PATCH 1/1] linux/sysinfo.h: Add guarder for struct sysinfo Petr Vorel
2020-09-30 23:42 ` Rich Felker
2020-10-01  5:47   ` Petr Vorel

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).