summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2006-02-15 20:41:06 +0000
committerGuillem Jover <guillem@hadrons.org>2008-05-06 08:51:56 +0300
commit1e8b819b4579d85654d46df2c16f3a58e9b6b878 (patch)
tree32ce81b76344cc3eebe012f98b2536e92ea8ede8
parent67e48af044abf058167a60b79d4165f0431fac5a (diff)
downloadlibbsd-1e8b819b4579d85654d46df2c16f3a58e9b6b878.tar.gz
Disable __unused
It conflicts with a struct member in a Linux header.
-rw-r--r--ChangeLog5
-rw-r--r--include/bsd/cdefs.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ae095d..0c7aaeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-15 Guillem Jover <guillem@debian.org>
+
+ * include/bsd/cdefs.h: Disable __unused, it conflicts with a struct
+ member in a Linux header.
+
2006-02-14 Guillem Jover <guillem@debian.org>
* include/bsd/stdlib.h: Remove <sys/types.h> and <stdio.h>.
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__