Define _DIRENT_MATCHES_DIRENT64 in bsd4.4/bits/dirent.h

diff --git a/ChangeLog b/ChangeLog
index 18fb8362cd552cd11ea6fef195f587019901b3f6..a2b3a9bcb203a6bd5bf3c36411eb31dc971427e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-07  Roland McGrath  <roland@hack.frob.com>
+
+       * sysdeps/unix/bsd/bsd4.4/bits/dirent.h
+       [__INO_T_MATCHES_INO64_T] (_DIRENT_MATCHES_DIRENT64): New macro.
+
 2012-08-07  Joseph Myers  <joseph@codesourcery.com>
 
        * 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 1e0f08b266fed76f69d292d2fc681b4e429da9c4..30b9940d6bf539fe1445dde3636f76d911a43218 100644 (file)
--- 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