From 6408bdde65cac02ef96ae9f2b77f222b534c0e75 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 6 Mar 1995 00:27:08 +0000
Subject: Fri Mar 3 12:24:52 1995 Roland McGrath
<roland@churchy.gnu.ai.mit.edu>
* sysdeps/generic/sys/mman.h (__mmap, __munmap): Declare these.
* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/osf1/sys/mman.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
* sysdeps/stub/munmap.c (munmap): Rename to __munmap, add weak
alias munmap.
* sysdeps/unix/mman/munmap.S: Likewise.
* sysdeps/mach/munmap.c: Likewise.
* sysdeps/mach/hurd/mmap.c (mmap): Rename to __mmap, add weak
alias mmap.
* sysdeps/unix/mman/mmap.S: Likewise.
* sysdeps/unix/bsd/sun/sunos4/mmap.c: Likewise.
* sysdeps/stub/mmap.c: Likewise.
* sysdeps/unix/bsd/setsid.c: Use __getpgid instead of __getpgrp.
* sysdeps/unix/dirfd.c: #undef dirfd before function defn.
Thu Mar 2 12:15:24 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* misc/search.h: Add missing semicolon.
* sysdeps/unix/dirfd.c: Fix typo.
* sysdeps/generic/sys/mman.h (mmap): Use __off_t instead of off_t
in decl.
* stdio/vfscanf.c (%c): In no-assign case, fix loop to decrement
WIDTH before test.
---
sysdeps/unix/dirfd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'sysdeps/unix/dirfd.c')
diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c
index 6b6f980a41..7733634a47 100644
--- a/sysdeps/unix/dirfd.c
+++ b/sysdeps/unix/dirfd.c
@@ -20,9 +20,11 @@ Cambridge, MA 02139, USA. */
#include <dirent.h>
#include <dirstream.h>
+#undef dirfd
+
int
dirfd (dirp)
- FILE *dirp;
+ DIR *dirp;
{
return dirp->__fd;
}
--
cgit v1.2.1