2008-07-31 Roland McGrath <roland@redhat.com>

	* file.c [LINUX] (struct kernel_dirent): Define it locally,
	do not use <linux/dirent.h>.
	Fixes RH#457291.

diff --git a/file.c b/file.c
index 55358625e6fb0014345f1ad36e4b49b5dccb31ff..ea6df327b49cf86d35f32f52d8b99b7592963967 100644 (file)
--- a/file.c
+++ b/file.c
@@ -34,15 +34,16 @@
 #include "defs.h"
 
 #include <dirent.h>
+
 #ifdef LINUX
-#define dirent kernel_dirent
-#define dirent64 kernel_dirent64
-#include <linux/types.h>
-#include <linux/dirent.h>
-#undef dirent
-#undef dirent64
+struct kernel_dirent {
+       unsigned long   d_ino;
+       unsigned long   d_off;
+       unsigned short  d_reclen;
+       char            d_name[1];
+};
 #else
-#define kernel_dirent dirent
+# define kernel_dirent dirent
 #endif
 
 #ifdef LINUX