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.

1 files changed, 0 insertions, 51 deletions

diff --git a/sysdeps/mach/hurd/readdir64.c b/sysdeps/mach/hurd/readdir64.c
deleted file mode 100644
index aed5e0199a..0000000000
--- a/sysdeps/mach/hurd/readdir64.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 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.  */
-
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <string.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-/* Read a directory entry from DIRP.  */
-struct dirent64 *
-__readdir64 (DIR *dirp)
-{
-  struct dirent *dp;
-  static struct dirent64 dent;
-
-  /* XXX the new __dir_readdir64 RPC is not yet implemented */
-
-  /* If __dir_readdir64 failed, then fall back on the old implementation */
-  dp = readdir (dirp);
-  if (!dp)
-    return NULL;
-
-  /* Return a struct dirent64, converted from the 32-bit value. */
-  memset (&dent, 0, sizeof (dent));
-  dent.d_reclen = sizeof (dent);
-
-  dent.d_ino = dp->d_fileno;
-  dent.d_type = dp->d_type;
-  memcpy (dent.d_name, dp->d_name, dp->d_namlen);
-
-  return &dent;
-}
-weak_alias (__readdir64, readdir64)