mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/4] glibc specific inclusion of sysinfo.h in kernel.h
@ 2014-03-14 16:14 David Heidelberger
  0 siblings, 0 replies; only message in thread
From: David Heidelberger @ 2014-03-14 16:14 UTC (permalink / raw)
  To: linux-kernel; +Cc: maillist-linux, torvalds

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.h.
so for now, only include it on glibc in order not to break their 
headers.

Signed-off-by: John Spencer <maillist-linux@barfooze.de>
Signed-off-by: David Heidelberger <david.heidelberger@ixit.cz>
---
  include/uapi/linux/kernel.h | 2 ++
  1 file changed, 2 insertion(+)

diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
index 321e399..8c45eeb 100644
--- a/include/uapi/linux/kernel.h
+++ b/include/uapi/linux/kernel.h
@@ -1,7 +1,9 @@
  #ifndef _UAPI_LINUX_KERNEL_H
  #define _UAPI_LINUX_KERNEL_H

+#ifdef __GLIBC__
  #include <linux/sysinfo.h>
+#endif

  /*
   * 'kernel.h' contains some often-used function prototypes etc
   */
-- 
1.8.4

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-03-14 15:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-14 16:14 [PATCH 1/4] glibc specific inclusion of sysinfo.h in kernel.h David Heidelberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®