tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"

Browse source
This commit is contained in:
Elliott Hughes 2012-09-26 14:58:10 -07:00 committed by Gerrit Code Review
commit 827a2604ee
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/kernel/arch-arm/asm/ucontext.h
View file

@ -27,7 +27,7 @@ struct ucontext {
struct sigcontext uc_mcontext;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
sigset_t uc_sigmask;
int __unused[32 - (sizeof (sigset_t) / sizeof (int))];
int __linux_unused[32 - (sizeof (sigset_t) / sizeof (int))];
unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

2
libc/kernel/common/linux/sysctl.h
View file

@ -34,7 +34,7 @@ struct __sysctl_args {
size_t __user *oldlenp;
void __user *newval;
size_t newlen;
unsigned long __unused[4];
unsigned long __linux_unused[4];
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
enum

1
libc/kernel/tools/defaults.py
View file

@ -51,6 +51,7 @@ kernel_default_arch_macros = {
# Replace tokens in the output according to this mapping
kernel_token_replacements = {
"asm": "__asm__",
"__unused": "__linux_unused", # The kernel usage of __unused conflicts with the macro defined in sys/cdefs.h
}
# this is the set of known static inline functions that we want to keep