From 1e8b819b4579d85654d46df2c16f3a58e9b6b878 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Feb 2006 20:41:06 +0000 Subject: [PATCH] Disable __unused It conflicts with a struct member in a Linux header. --- ChangeLog | 5 +++++ include/bsd/cdefs.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9ae095d..0c7aaeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-15 Guillem Jover + + * include/bsd/cdefs.h: Disable __unused, it conflicts with a struct + member in a Linux header. + 2006-02-14 Guillem Jover * include/bsd/stdlib.h: Remove and . diff --git a/include/bsd/cdefs.h b/include/bsd/cdefs.h index a23e15e..d976da9 100644 --- a/include/bsd/cdefs.h +++ b/include/bsd/cdefs.h @@ -11,6 +11,9 @@ # define __dead2 #endif +/* Linux headers define a struct with a member names __unused. + * Disable for now. */ +#if 0 #ifndef __unused # ifdef __GNUC__ # define __unused __attribute__((unused)) @@ -18,6 +21,7 @@ # define __unused # endif #endif +#endif #ifndef __printflike # ifdef __GNUC__