From: Roland McGrath <roland@redhat.com>
Date: Fri, 1 Aug 2008 01:13:10 +0000 (+0000)
Subject: 2008-07-31  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c531e571fe6879b7e0bc0fd6ea577907a8a2e005;p=strace

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 55358625..ea6df327 100644
--- 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