[PATCH] sys/kd.h should undefine _LINUX_TYPES_H if it set it.

[Jeremy Huddleston]

With linux-2.6.10 headers and glibc-2.3.4, the following code will fail:
#include <sys/kd.h>
#include <linux/byteorder/big_endian.h>
int main() {
        return 0;
}

This is because linux/byteorder/big_endian.h needs linux/types.h for
__le64, but sys/kd.h defines _LINUX_TYPES_H which prevents it from being
included. This patch remedies the problem the same way sys/sysctl.h
handles it.

--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/sys/kd.h	2001-07-05
21:56:21.000000000 -0700
+++ glibc-2.3.4.allowtypesh/sysdeps/unix/sysv/linux/sys/kd.h	2005-03-07
03:16:17.068480502 -0800
@@ -22,8 +22,14 @@
 /* Make sure the <linux/types.h> header is not loaded.  */
 #ifndef _LINUX_TYPES_H
 # define _LINUX_TYPES_H	1
+# define __undef_LINUX_TYPES_H
 #endif
 
 #include <linux/kd.h>
 
+#ifdef __undef_LINUX_TYPES_H
+# undef _LINUX_TYPES_H
+# undef __undef_LINUX_TYPES_H
+#endif
+
 #endif	/* sys/kd.h */

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20050307/6b32d05f/attachment.sig>