diff options
author | Roland McGrath <roland@gnu.org> | 1998-12-20 19:13:11 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1998-12-20 19:13:11 +0000 |
commit | 6ac73ea734be9f238e65a7df07db88b49851526a (patch) | |
tree | fe23265a702a41fdbbd9dcaf3431f14bd730bbcb /sysdeps/mach/hurd/bits | |
parent | c5720a93963d3c47fdac1d41b0e2629e927ca63b (diff) | |
download | glibc-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/mach/hurd/bits')
-rw-r--r-- | sysdeps/mach/hurd/bits/dirent.h | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/sysdeps/mach/hurd/bits/dirent.h b/sysdeps/mach/hurd/bits/dirent.h deleted file mode 100644 index 6609fde8ea..0000000000 --- a/sysdeps/mach/hurd/bits/dirent.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Directory entry structure `struct dirent'. Hurd version. - 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _DIRENT_H -# error "Never use <bits/dirent.h> directly; include <dirent.h> instead." -#endif - -#ifndef __USE_FILE_OFFSET64 -/* The old BSD4.4-compatible struct dirent. */ -struct dirent - { - __ino_t d_ino; /* File serial number. */ - 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. */ - - /* Only this member is in the POSIX standard. */ - char d_name[1]; /* File name (actually longer). */ - }; - -#else -/* Linux-style 64-bit struct dirent. */ -struct dirent - { - __ino64_t d_ino; - __off64_t d_off; - unsigned short int d_reclen; - unsigned char d_type; - char d_name[256]; /* We must not include limits.h! */ - }; -#endif - -#ifdef __USE_LARGEFILE64 -/* Same as above (Linux-style 64-bit struct dirent). */ -struct dirent64 - { - __ino64_t d_ino; - __off64_t d_off; - unsigned short int d_reclen; - unsigned char d_type; - char d_name[256]; /* We must not include limits.h! */ - }; -#endif - -#define d_fileno d_ino /* Backwards compatibility. */ - -/* These definitions are accurate for neither the 32-bit nor the - 64-bit structures, but at least they are compatible. */ -#undef _DIRENT_HAVE_D_NAMLEN -#define _DIRENT_HAVE_D_RECLEN 1 -#define _DIRENT_HAVE_D_TYPE 1 |