about summary refs log tree commit diff
path: root/sysdeps/unix/bsd/bsd4.4/bits
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1998-12-20 19:13:11 +0000
committerRoland McGrath <roland@gnu.org>1998-12-20 19:13:11 +0000
commit6ac73ea734be9f238e65a7df07db88b49851526a (patch)
treefe23265a702a41fdbbd9dcaf3431f14bd730bbcb /sysdeps/unix/bsd/bsd4.4/bits
parentc5720a93963d3c47fdac1d41b0e2629e927ca63b (diff)
downloadglibc-6ac73ea734be9f238e65a7df07db88b49851526a.tar.gz
glibc-6ac73ea734be9f238e65a7df07db88b49851526a.tar.xz
glibc-6ac73ea734be9f238e65a7df07db88b49851526a.zip
1998-12-06 Mark Kettenis <kettenis@phys.uva.nl>
	Reverse the change of 1998-04-22.  Providing a struct dirent with
	different members when __USE_FILE_OFFSET64 is defined is asking
	for trouble.  Instead add the necessary LFS magic to the 4.4BSD
	header.
	* sysdeps/unix/bsd/bsd4.4/bits/dirent.h: Add LFS definitions.
	* sysdeps/mach/hurd/bits/dirent.h: Removed.
	* sysdeps/mach/hurd/readdir64.c: Removed.
	* sysdeps/mach/hurd/readdir64_r.c: Removed.

	* sysdeps/generic/bits/mman.h [__USE_MISC] (MAP_ANONYMOUS): Define as
	alias for MAP_ANON.

	* stdio/stdio.h (sys_errlist, sys_nerr, _sys_errlist, _sys_nerr):
	Remove decls.  They don't exist at all on the Hurd.
Diffstat (limited to 'sysdeps/unix/bsd/bsd4.4/bits')
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/dirent.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h b/sysdeps/unix/bsd/bsd4.4/bits/dirent.h
index e29dac4806..cf1f72c997 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 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -23,7 +23,11 @@
 
 struct dirent
   {
+#ifndef __USE_FILE_OFFSET64
     __ino_t d_fileno;		/* File serial number.  */
+#else
+    __ino64_t d_fileno;
+#endif
     unsigned short int d_reclen; /* Length of the whole `struct dirent'.  */
     unsigned char d_type;	/* File type, possibly unknown.  */
     unsigned char d_namlen;	/* Length of the file name.  */
@@ -32,6 +36,18 @@ struct dirent
     char d_name[1];		/* File name (actually longer).  */
   };
 
+#ifdef __USE_LARGEFILE64
+struct dirent64
+  {
+    __ino64_t d_fileno;
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    unsigned char d_namlen;
+
+    char d_name[1];
+  };
+#endif
+
 #define _DIRENT_HAVE_D_RECLEN 1
 #define _DIRENT_HAVE_D_NAMLEN 1
 #define _DIRENT_HAVE_D_TYPE 1