summary refs log tree commit diff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-14 05:59:03 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-14 05:59:03 +0000
commit8f6f7a31c9aea07b4f364fe1ba33fa099169a007 (patch)
tree2126fb19d16b6cdc6d74334291f300c92bb8e308 /sysdeps/generic
parent79e195ed8251bd39619f1b1b6ade9bf50e5a6ee3 (diff)
downloadglibc-8f6f7a31c9aea07b4f364fe1ba33fa099169a007.tar.gz
glibc-8f6f7a31c9aea07b4f364fe1ba33fa099169a007.tar.xz
glibc-8f6f7a31c9aea07b4f364fe1ba33fa099169a007.zip
Update.
2000-04-13  Ulrich Drepper  <drepper@redhat.com>

	* misc/Versions [libc] (GLIBC_2.2): Add posix_madvice.
	* misc/sys/mman.h (posix_madvise): Add prototype.
	* sysdeps/generic/madvise.c (madvise): Renamed to __madvise.  Make
	old name and posix_madvise weak aliases.
	* sysdeps/unix/sysv/linux/syscalls.list: Likewise.
	* sysdeps/generic/bits/mman.h: Add POSIX_MADV_* constants.
	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Likewise.
	* sysdeps/unix/sysv/linux/arm/bits/mman.h: Likewise.
	* sysdeps/unix/sysv/linux/i386/bits/mman.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/mman.h: Likewise.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r--sysdeps/generic/bits/mman.h16
-rw-r--r--sysdeps/generic/madvise.c7
2 files changed, 16 insertions, 7 deletions
diff --git a/sysdeps/generic/bits/mman.h b/sysdeps/generic/bits/mman.h
index 99e3bcd1e8..57d42546d3 100644
--- a/sysdeps/generic/bits/mman.h
+++ b/sysdeps/generic/bits/mman.h
@@ -1,5 +1,5 @@
 /* Definitions for BSD-style memory management.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1994-1998, 2000 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
@@ -21,8 +21,9 @@
    (such as GNU) where these facilities are not system services but can be
    emulated in the C library, these are the definitions we emulate.  */
 
-#ifndef	_BITS_MMAN_H
-#define	_BITS_MMAN_H	1
+#ifndef _SYS_MMAN_H
+# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead."
+#endif
 
 /* Protections are chosen from these bits, OR'd together.  The
    implementation does not necessarily support PROT_EXEC or PROT_WRITE
@@ -70,4 +71,11 @@
 # define MADV_DONTNEED	 4	/* Don't need these pages.  */
 #endif
 
-#endif /* bits/mman.h */
+/* The POSIX people had to invent similar names for the same things.  */
+#ifdef __USE_XOPEN2K
+# define POSIX_MADV_NORMAL	0 /* No further special treatment.  */
+# define POSIX_MADV_RANDOM	1 /* Expect random page references.  */
+# define POSIX_MADV_SEQUENTIAL	2 /* Expect sequential page references.  */
+# define POSIX_MADV_WILLNEED	3 /* Will need these pages.  */
+# define POSIX_MADV_DONTNEED	4 /* Don't need these pages.  */
+#endif
diff --git a/sysdeps/generic/madvise.c b/sysdeps/generic/madvise.c
index 5431bda111..d6c2322d25 100644
--- a/sysdeps/generic/madvise.c
+++ b/sysdeps/generic/madvise.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1996, 1997, 2000 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
@@ -24,11 +24,12 @@
    for the region starting at ADDR and extending LEN bytes.  */
 
 int
-madvise (__ptr_t addr, size_t len, int advice)
+__madvise (__ptr_t addr, size_t len, int advice)
 {
   __set_errno (ENOSYS);
   return -1;
 }
-
+weak_alias (__madvice, madvice)
+weak_alias (__madvice, posix_madvise)
 stub_warning (madvise)
 #include <stub-tag.h>