From 6408bdde65cac02ef96ae9f2b77f222b534c0e75 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 6 Mar 1995 00:27:08 +0000 Subject: Fri Mar 3 12:24:52 1995 Roland McGrath * 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 * 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/mach/hurd/mmap.c | 6 ++++-- sysdeps/mach/munmap.c | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index e682225ec8..0fb1a08cfb 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995 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 @@ -32,7 +32,7 @@ Cambridge, MA 02139, USA. */ deallocates any previous mapping for the affected region. */ caddr_t -mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) +__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) { error_t err; vm_prot_t vmprot; @@ -102,4 +102,6 @@ mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) return err ? (caddr_t) (long int) __hurd_fail (err) : (caddr_t) mapaddr; } + +weak_alias (__mmap, mmap) diff --git a/sysdeps/mach/munmap.c b/sysdeps/mach/munmap.c index 5ca11298f3..29270bb7f4 100644 --- a/sysdeps/mach/munmap.c +++ b/sysdeps/mach/munmap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995 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 @@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */ bytes. Returns 0 if successful, -1 for errors (and sets errno). */ int -munmap (caddr_t addr, size_t len) +__munmap (caddr_t addr, size_t len) { kern_return_t err; if (err = __vm_deallocate (__mach_task_self (), @@ -36,4 +36,5 @@ munmap (caddr_t addr, size_t len) } return 0; } - + +weak_alias (__munmap, munmap) -- cgit v1.2.3