aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-07 13:15:18 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-07 13:15:18 -0700
commitd34689de847aa0a2b01ed6ec4895f289d7453905 (patch)
tree57db5cbdfe0e14c3b85a5c255d719a906725ae3b
parent6dad2c06889774ddaf6eac09799821e3941bfa87 (diff)
downloadglibc-d34689de847aa0a2b01ed6ec4895f289d7453905.zip
glibc-d34689de847aa0a2b01ed6ec4895f289d7453905.tar.gz
glibc-d34689de847aa0a2b01ed6ec4895f289d7453905.tar.bz2
Define _DIRENT_MATCHES_DIRENT64 in bsd4.4/bits/dirent.h
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/dirent.h7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18fb836..a2b3a9b 100644
--- 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 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