mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 03:33:33 +08:00
498afc54df
This patch cleans up following the obsoletion of _BSD_SOURCE and _SVID_SOURCE by combining __USE_BSD and __USE_SVID into __USE_MISC. The only non-mechanical part of this patch is the changes to features.h; everything else is simple substitution of __USE_MISC for the old macros. Thus, this patch leaves obviously redundant conditionals such as "defined __USE_MISC || defined __USE_MISC", and does not update #endif comments where they referred to BSD or SVID in words instead of the literal macro name. This is intended to facilitate patch review by separating the less mechanical changes from these purely mechanical changes into a separate patch. (I do intend to integrate all the changes from <https://sourceware.org/ml/libc-alpha/2013-12/msg00226.html>, which I believe includes all the trailing comment updates, in subsequent patches.) Tested x86_64. * include/features.h (__USE_BSD): Remove macro definitions. (__USE_SVID): Likewise. (_BSD_SOURCE): Likewise. (_SVID_SOURCE): Likewise. [!defined _BSD_SOURCE && !defined _SVID_SOURCE]: Remove condition from definition of _DEFAULT_SOURCE. [_BSD_SOURCE || _SVID_SOURCE]: Change condition to [_DEFAULT_SOURCE]. * bits/fcntl.h [__USE_BSD]: Change condition to [__USE_MISC]. * bits/mman.h [__USE_BSD]: Likewise. * bits/termios.h [__USE_BSD]: Likewise. * bits/waitstatus.h [__USE_BSD]: Likewise. * ctype/ctype.h [__USE_SVID]: Likewise. * dirent/dirent.h [__USE_BSD]: Likewise. * grp/grp.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * inet/netinet/igmp.h [__USE_BSD]: Likewise. * io/fcntl.h [__USE_BSD]: Likewise. * io/ftw.h [__USE_BSD]: Likewise. * io/sys/stat.h [__USE_BSD]: Likewise. * libio/bits/stdio-ldbl.h [__USE_BSD]: Likewise. * libio/bits/stdio2.h [__USE_BSD]: Likewise. * libio/stdio.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * math/math.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * misc/bits/syslog-ldbl.h [__USE_BSD]: Likewise. * misc/bits/syslog.h [__USE_BSD]: Likewise. * misc/search.h [__USE_SVID]: Likewise. * misc/sys/mman.h [__USE_BSD]: Likewise. * misc/sys/syslog.h [__USE_BSD]: Likewise. * misc/sys/uio.h [__USE_BSD]: Likewise. * posix/bits/unistd.h [__USE_BSD]: Likewise. * posix/glob.h [__USE_BSD]: Likewise. * posix/regex.h [__USE_BSD]: Likewise. * posix/sys/types.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/sys/utsname.h [__USE_SVID]: Likewise. * posix/sys/wait.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/unistd.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * pwd/pwd.h [__USE_SVID]: Likewise. * resolv/netdb.h [__USE_BSD]: Likewise. * setjmp/setjmp.h [__USE_BSD]: Likewise. * signal/signal.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * socket/sys/socket.h [__USE_BSD]: Likewise. * stdlib/fmtmsg.h [__USE_SVID]: Likewise. * stdlib/stdlib.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string2.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string3.h [__USE_BSD]: Likewise. * string/endian.h [__USE_BSD]: Likewise. * string/string.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * string/strings.h [__USE_BSD]: Likewise. * sysdeps/generic/netinet/ip.h [__USE_BSD]: Likewise. * sysdeps/gnu/netinet/ip_icmp.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/sys_errlist.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_ether.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_fddi.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_tr.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/x86/bits/string.h [__USE_BSD]: Likewise. * sysvipc/sys/ipc.h [__USE_SVID]: Likewise. * termios/termios.h [__USE_BSD]: Likewise. * time/sys/time.h [__USE_BSD]: Likewise. * time/time.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_BSD]: Change condition to [__USE_MISC].
97 lines
3.9 KiB
C
97 lines
3.9 KiB
C
/* Definitions for BSD-style memory management.
|
|
Copyright (C) 1994-2014 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* These are the bits used by 4.4 BSD and its derivatives. On systems
|
|
(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 _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
|
|
without PROT_READ. The only guarantees are that no writing will be
|
|
allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */
|
|
|
|
#define PROT_NONE 0x00 /* No access. */
|
|
#define PROT_READ 0x04 /* Pages can be read. */
|
|
#define PROT_WRITE 0x02 /* Pages can be written. */
|
|
#define PROT_EXEC 0x01 /* Pages can be executed. */
|
|
|
|
/* Flags contain mapping type, sharing type and options. */
|
|
|
|
/* Mapping type (must choose one and only one of these). */
|
|
#ifdef __USE_MISC
|
|
# define MAP_FILE 0x0001 /* Mapped from a file or device. */
|
|
# define MAP_ANON 0x0002 /* Allocated from anonymous virtual memory. */
|
|
# define MAP_TYPE 0x000f /* Mask for type field. */
|
|
# ifdef __USE_MISC
|
|
# define MAP_ANONYMOUS MAP_ANON /* Linux name. */
|
|
# endif
|
|
#endif
|
|
|
|
/* Sharing types (must choose one and only one of these). */
|
|
#ifdef __USE_MISC
|
|
# define MAP_COPY 0x0020 /* Virtual copy of region at mapping time. */
|
|
#endif
|
|
#define MAP_SHARED 0x0010 /* Share changes. */
|
|
#define MAP_PRIVATE 0x0000 /* Changes private; copy pages on write. */
|
|
|
|
/* Other flags. */
|
|
#define MAP_FIXED 0x0100 /* Map address must be exactly as requested. */
|
|
#ifdef __USE_MISC
|
|
# define MAP_NOEXTEND 0x0200 /* For MAP_FILE, don't change file size. */
|
|
# define MAP_HASSEMPHORE 0x0400 /* Region may contain semaphores. */
|
|
# define MAP_INHERIT 0x0800 /* Region is retained after exec. */
|
|
#endif
|
|
|
|
/* Advice to `madvise'. */
|
|
#ifdef __USE_MISC
|
|
# define MADV_NORMAL 0 /* No further special treatment. */
|
|
# define MADV_RANDOM 1 /* Expect random page references. */
|
|
# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */
|
|
# define MADV_WILLNEED 3 /* Will need these pages. */
|
|
# define MADV_DONTNEED 4 /* Don't need these pages. */
|
|
#endif
|
|
|
|
/* 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
|
|
|
|
/* Flags to `msync'. */
|
|
#define MS_ASYNC 1 /* Sync memory asynchronously. */
|
|
#define MS_SYNC 0 /* Synchronous memory sync. */
|
|
#define MS_INVALIDATE 2 /* Invalidate the caches. */
|
|
|
|
/* Flags for `mremap'. */
|
|
#ifdef __USE_GNU
|
|
# define MREMAP_MAYMOVE 1 /* Mapping address may change. */
|
|
# define MREMAP_FIXED 2 /* Fifth argument sets new address. */
|
|
#endif
|
|
|
|
/* Flags for `mlockall' (can be OR'd together). */
|
|
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */
|
|
#define MCL_FUTURE 2 /* Lock all additions to address
|
|
space. */
|