aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-08-06 04:24:40 +0000
committerRoland McGrath <roland@gnu.org>2001-08-06 04:24:40 +0000
commit245ef8366aca8d26d9dc0cc244d9f3a10942d01e (patch)
tree79d05b72a7a1fc88bcbb60d20536d26ba180ce82
parentbece3642a87aebad05a99200758d6ebd147acab8 (diff)
downloadglibc-245ef8366aca8d26d9dc0cc244d9f3a10942d01e.tar
glibc-245ef8366aca8d26d9dc0cc244d9f3a10942d01e.tar.gz
glibc-245ef8366aca8d26d9dc0cc244d9f3a10942d01e.tar.bz2
glibc-245ef8366aca8d26d9dc0cc244d9f3a10942d01e.zip
* sysdeps/unix/bsd/bsd4.4/bits/dirent.h (struct dirent): Rename member
d_fileno to d_ino. (struct dirent64): Likewise. (d_fileno): Define as macro.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/dirent.h10
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index afa5783faf..f07d8161c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-05 Roland McGrath <roland@frob.com>
+
+ * sysdeps/unix/bsd/bsd4.4/bits/dirent.h (struct dirent): Rename member
+ d_fileno to d_ino.
+ (struct dirent64): Likewise.
+ (d_fileno): Define as macro.
+
2001-08-04 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/getrusage.c: Use TASK_EVENTS_INFO if implemented
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h b/sysdeps/unix/bsd/bsd4.4/bits/dirent.h
index a204df36a4..3f8990cb5d 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, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996,97,98,2001 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
@@ -24,9 +24,9 @@
struct dirent
{
#ifndef __USE_FILE_OFFSET64
- __ino_t d_fileno; /* File serial number. */
+ __ino_t d_ino; /* File serial number. */
#else
- __ino64_t d_fileno;
+ __ino64_t d_ino;
#endif
unsigned short int d_reclen; /* Length of the whole `struct dirent'. */
unsigned char d_type; /* File type, possibly unknown. */
@@ -39,7 +39,7 @@ struct dirent
#ifdef __USE_LARGEFILE64
struct dirent64
{
- __ino64_t d_fileno;
+ __ino64_t d_ino;
unsigned short int d_reclen;
unsigned char d_type;
unsigned char d_namlen;
@@ -48,6 +48,8 @@ struct dirent64
};
#endif
+#define d_fileno d_ino /* Backwards compatibility. */
+
#define _DIRENT_HAVE_D_RECLEN 1
#define _DIRENT_HAVE_D_NAMLEN 1
#define _DIRENT_HAVE_D_TYPE 1