From d34689de847aa0a2b01ed6ec4895f289d7453905 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 7 Aug 2012 13:15:18 -0700 Subject: [PATCH] Define _DIRENT_MATCHES_DIRENT64 in bsd4.4/bits/dirent.h --- ChangeLog | 5 +++++ sysdeps/unix/bsd/bsd4.4/bits/dirent.h | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 18fb836..a2b3a9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-08-07 Roland McGrath + + * sysdeps/unix/bsd/bsd4.4/bits/dirent.h + [__INO_T_MATCHES_INO64_T] (_DIRENT_MATCHES_DIRENT64): New macro. + 2012-08-07 Joseph Myers * sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel): diff --git a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h b/sysdeps/unix/bsd/bsd4.4/bits/dirent.h index 1e0f08b..30b9940 100644 --- a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h +++ b/sysdeps/unix/bsd/bsd4.4/bits/dirent.h @@ -1,5 +1,5 @@ /* Directory entry structure `struct dirent'. 4.4BSD version. - Copyright (C) 1996,97,98,2001 Free Software Foundation, Inc. + Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -52,3 +52,8 @@ struct dirent64 #define _DIRENT_HAVE_D_RECLEN 1 #define _DIRENT_HAVE_D_NAMLEN 1 #define _DIRENT_HAVE_D_TYPE 1 + +#ifdef __INO_T_MATCHES_INO64_T +/* Inform libc code that these two types are effectively identical. */ +# define _DIRENT_MATCHES_DIRENT64 1 +#endif -- 2.7.4