mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	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].
		
			
				
	
	
		
			109 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			109 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Definitions for POSIX memory map interface.  Linux generic version.
 | |
|    Copyright (C) 2001-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/>.  */
 | |
| 
 | |
| #ifndef _SYS_MMAN_H
 | |
| # error "Never use <bits/mman-linux.h> directly; include <sys/mman.h> instead."
 | |
| #endif
 | |
| 
 | |
| /* The following definitions basically come from the kernel headers.
 | |
|    But the kernel header is not namespace clean.  */
 | |
| 
 | |
| 
 | |
| /* 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_READ	0x1		/* Page can be read.  */
 | |
| #define PROT_WRITE	0x2		/* Page can be written.  */
 | |
| #define PROT_EXEC	0x4		/* Page can be executed.  */
 | |
| #define PROT_NONE	0x0		/* Page can not be accessed.  */
 | |
| #define PROT_GROWSDOWN	0x01000000	/* Extend change to start of
 | |
| 					   growsdown vma (mprotect only).  */
 | |
| #define PROT_GROWSUP	0x02000000	/* Extend change to start of
 | |
| 					   growsup vma (mprotect only).  */
 | |
| 
 | |
| /* Sharing types (must choose one and only one of these).  */
 | |
| #define MAP_SHARED	0x01		/* Share changes.  */
 | |
| #define MAP_PRIVATE	0x02		/* Changes are private.  */
 | |
| #ifdef __USE_MISC
 | |
| # define MAP_TYPE	0x0f		/* Mask for type of mapping.  */
 | |
| #endif
 | |
| 
 | |
| /* Other flags.  */
 | |
| #define MAP_FIXED	0x10		/* Interpret addr exactly.  */
 | |
| #ifdef __USE_MISC
 | |
| # define MAP_FILE	0
 | |
| # ifdef __MAP_ANONYMOUS
 | |
| #  define MAP_ANONYMOUS	__MAP_ANONYMOUS	/* Don't use a file.  */
 | |
| # else
 | |
| #  define MAP_ANONYMOUS	0x20		/* Don't use a file.  */
 | |
| # endif
 | |
| # define MAP_ANON	MAP_ANONYMOUS
 | |
| /* When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.  */
 | |
| # define MAP_HUGE_SHIFT	26
 | |
| # define MAP_HUGE_MASK	0x3f
 | |
| #endif
 | |
| 
 | |
| /* Flags to `msync'.  */
 | |
| #define MS_ASYNC	1		/* Sync memory asynchronously.  */
 | |
| #define MS_SYNC		4		/* Synchronous memory sync.  */
 | |
| #define MS_INVALIDATE	2		/* Invalidate the caches.  */
 | |
| 
 | |
| /* Flags for `mremap'.  */
 | |
| #ifdef __USE_GNU
 | |
| # define MREMAP_MAYMOVE	1
 | |
| # define MREMAP_FIXED	2
 | |
| #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.  */
 | |
| # define MADV_REMOVE	  9	/* Remove these pages and resources.  */
 | |
| # define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
 | |
| # define MADV_DOFORK	  11	/* Do inherit across fork.  */
 | |
| # define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
 | |
| # define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
 | |
| # define MADV_HUGEPAGE	  14	/* Worth backing with hugepages.  */
 | |
| # define MADV_NOHUGEPAGE  15	/* Not worth backing with hugepages.  */
 | |
| # define MADV_DONTDUMP	  16    /* Explicity exclude from the core dump,
 | |
|                                    overrides the coredump filter bits.  */
 | |
| # define MADV_DODUMP	  17	/* Clear the MADV_DONTDUMP flag.  */
 | |
| # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
 | |
| #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 for `mlockall'.  */
 | |
| #ifndef MCL_CURRENT
 | |
| # define MCL_CURRENT	1		/* Lock all currently mapped pages.  */
 | |
| # define MCL_FUTURE	2		/* Lock all additions to address
 | |
| 					   space.  */
 | |
| #endif
 |