Bug#429064: linux-libc-dev: <linux/types.h> conflicts with <sys/ustat.h>

[Matej Vela <vela@debian.org>]

Package: linux-libc-dev
Version: 2.6.21-4
Severity: serious
Justification: causes build failures (#428944)

<linux/types.h> can't be used together with <sys/ustat.h> because they
both define struct ustat:

    $ cat test.c
    #include <sys/ustat.h>
    #include <linux/types.h>
    $ gcc -c test.c
    In file included from test.c:2:
    /usr/include/linux/types.h:165: error: redefinition of 'struct ustat'

linux-kernel-headers solved this by removing the definition from
<linux/types.h> -- see debian/patches/linux-types-ustat.patch:

--- include/linux/types.h.orig	2006-06-10 00:16:51.962628154 -0400
+++ include/linux/types.h	2006-06-10 00:20:28.592333583 -0400
@@ -188,11 +188,14 @@
 typedef unsigned __bitwise__ gfp_t;
 #endif
 
+#if 0
+/* Debian: This is available from <sys/ustat.h>.  */
 struct ustat {
 	__kernel_daddr_t	f_tfree;
 	__kernel_ino_t		f_tinode;
 	char			f_fname[6];
 	char			f_fpack[6];
 };
+#endif
 
 #endif /* _LINUX_TYPES_H */

Thanks,

Matej