r1207 - in trunk/libbsd: . include/bsd

[Guillem Jover <guillem@costa.debian.org>]

Author: guillem
Date: 2006-02-15 20:41:06 +0000 (Wed, 15 Feb 2006)
New Revision: 1207

Modified:
   trunk/libbsd/ChangeLog
   trunk/libbsd/include/bsd/cdefs.h
Log:
Disable __unused, it conflicts with a struct member in a Linux header.


Modified: trunk/libbsd/ChangeLog
===================================================================
--- trunk/libbsd/ChangeLog	2006-02-15 18:20:05 UTC (rev 1206)
+++ trunk/libbsd/ChangeLog	2006-02-15 20:41:06 UTC (rev 1207)
@@ -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>.

Modified: trunk/libbsd/include/bsd/cdefs.h
===================================================================
--- trunk/libbsd/include/bsd/cdefs.h	2006-02-15 18:20:05 UTC (rev 1206)
+++ trunk/libbsd/include/bsd/cdefs.h	2006-02-15 20:41:06 UTC (rev 1207)
@@ -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__