yann@1182: --- strace-orig/file.c 2008/05/20 04:56:18 1.92 yann@1182: +++ strace/file.c 2008/08/01 01:13:10 1.93 yann@1182: @@ -28,21 +28,22 @@ yann@1182: * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF yann@1182: * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. yann@1182: * yann@1182: - * $Id: file.c,v 1.92 2008/05/20 04:56:18 roland Exp $ yann@1182: + * $Id: file.c,v 1.93 2008/08/01 01:13:10 roland Exp $ yann@1182: */ yann@1182: yann@1182: #include "defs.h" yann@1182: yann@1182: #include yann@1182: + yann@1182: #ifdef LINUX yann@1182: -#define dirent kernel_dirent yann@1182: -#define dirent64 kernel_dirent64 yann@1182: -#include yann@1182: -#include yann@1182: -#undef dirent yann@1182: -#undef dirent64 yann@1182: +struct kernel_dirent { yann@1182: + unsigned long d_ino; yann@1182: + unsigned long d_off; yann@1182: + unsigned short d_reclen; yann@1182: + char d_name[1]; yann@1182: +}; yann@1182: #else yann@1182: -#define kernel_dirent dirent yann@1182: +# define kernel_dirent dirent yann@1182: #endif yann@1182: yann@1182: #ifdef LINUX