Tomasz Torcz <tomek@xxxxxxxxxxxxxx> wrote:
> In file included from cli.c:20:0:
> common.h:152:8: error: redefinition of 'struct sysinfo'
> In file included from /usr/include/linux/kernel.h:4:0,
> from /usr/include/linux/sysctl.h:25,
> from /usr/include/sys/sysctl.h:43,
> from common.h:50,
> from cli.c:20:
> /usr/include/linux/sysinfo.h:7:8: note: originally defined here
The attached patch to the kernel should fix this. The problem is that many of
the userspace API files all got their guards renamed inside of the kernel when
they got split out into separate files (rather than being renamed).
A better way to do this might be to make the header installation discard the
"_UAPI" prefix that got added.
David
---
commit 24d4756373d825c43c5f5c3cf1fc6737943abf53
Author: David Howells <dhowells@xxxxxxxxxx>
Date: Wed Nov 7 16:40:14 2012 +0000
UAPI: The guards on linux/types.h and linxu/kernel.h are used by glibc
The guards on linux/types.h and linux/kernel.h are used by glibc, and so
shouldn't have been changed for the UAPI variants of those headers. Change
those guards back and alter the ones on the KAPI variants instead.
Interestingly, sys/sysctl.h shows checks on linux/list.h and linux/compiler.h,
even though those headers aren't exported.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a123b13..e0e6839 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -1,5 +1,5 @@
-#ifndef _LINUX_KERNEL_H
-#define _LINUX_KERNEL_H
+#ifndef _KAPI_LINUX_KERNEL_H
+#define _KAPI_LINUX_KERNEL_H
#include <stdarg.h>
diff --git a/include/linux/types.h b/include/linux/types.h
index 1cc0e4b..1e99075 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,5 +1,5 @@
-#ifndef _LINUX_TYPES_H
-#define _LINUX_TYPES_H
+#ifndef _KAPI_LINUX_TYPES_H
+#define _KAPI_LINUX_TYPES_H
#define __EXPORTED_HEADERS__
#include <uapi/linux/types.h>
@@ -212,4 +212,4 @@ struct callback_head {
#define rcu_head callback_head
#endif /* __ASSEMBLY__ */
-#endif /* _LINUX_TYPES_H */
+#endif /* _KAPI_LINUX_TYPES_H */
diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
index 321e399..642d1e9 100644
--- a/include/uapi/linux/kernel.h
+++ b/include/uapi/linux/kernel.h
@@ -1,5 +1,5 @@
-#ifndef _UAPI_LINUX_KERNEL_H
-#define _UAPI_LINUX_KERNEL_H
+#ifndef _LINUX_KERNEL_H
+#define _LINUX_KERNEL_H
#include <linux/sysinfo.h>
@@ -10,4 +10,4 @@
#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
-#endif /* _UAPI_LINUX_KERNEL_H */
+#endif /* _LINUX_KERNEL_H */
diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h
index acf0979..a9b87a8 100644
--- a/include/uapi/linux/types.h
+++ b/include/uapi/linux/types.h
@@ -1,5 +1,5 @@
-#ifndef _UAPI_LINUX_TYPES_H
-#define _UAPI_LINUX_TYPES_H
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
#include <asm/types.h>
@@ -53,4 +53,4 @@ typedef __u32 __bitwise __wsum;
#define __aligned_le64 __le64 __attribute__((aligned(8)))
#endif /* __ASSEMBLY__ */
-#endif /* _UAPI_LINUX_TYPES_H */
+#endif /* _LINUX_TYPES_H */
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
