mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user