mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
		
			
				
	
	
		
			227 lines
		
	
	
		
			8.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			227 lines
		
	
	
		
			8.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (C) 1991-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/>.  */
 | |
| 
 | |
| /* Linux version.  */
 | |
| 
 | |
| #ifndef _NETINET_IN_H
 | |
| # error "Never use <bits/in.h> directly; include <netinet/in.h> instead."
 | |
| #endif
 | |
| 
 | |
| /* If the application has already included linux/in6.h from a linux-based
 | |
|    kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the
 | |
|    defines), sockaddr_in6, or ipv6_mreq.  The ABI used by the linux-kernel and
 | |
|    glibc match exactly.  Neither the linux kernel nor glibc should break this
 | |
|    ABI without coordination.  */
 | |
| #ifdef _UAPI_LINUX_IN6_H
 | |
| /* This is not quite the same API since the kernel always defines s6_addr16 and
 | |
|    s6_addr32. This is not a violation of POSIX since POSIX says "at least the
 | |
|    following member" and that holds true.  */
 | |
| # define __USE_KERNEL_IPV6_DEFS
 | |
| #endif
 | |
| 
 | |
| /* Options for use with `getsockopt' and `setsockopt' at the IP level.
 | |
|    The first word in the comment at the right is the data type used;
 | |
|    "bool" means a boolean value stored in an `int'.  */
 | |
| #define        IP_OPTIONS      4       /* ip_opts; IP per-packet options.  */
 | |
| #define        IP_HDRINCL      3       /* int; Header is included with data.  */
 | |
| #define        IP_TOS          1       /* int; IP type of service and precedence.  */
 | |
| #define        IP_TTL          2       /* int; IP time to live.  */
 | |
| #define        IP_RECVOPTS     6       /* bool; Receive all IP options w/datagram.  */
 | |
| /* For BSD compatibility.  */
 | |
| #define        IP_RECVRETOPTS  IP_RETOPTS       /* bool; Receive IP options for response.  */
 | |
| #define        IP_RETOPTS      7       /* ip_opts; Set/get IP per-packet options.  */
 | |
| #define IP_MULTICAST_IF 32	/* in_addr; set/get IP multicast i/f */
 | |
| #define IP_MULTICAST_TTL 33	/* u_char; set/get IP multicast ttl */
 | |
| #define IP_MULTICAST_LOOP 34	/* i_char; set/get IP multicast loopback */
 | |
| #define IP_ADD_MEMBERSHIP 35	/* ip_mreq; add an IP group membership */
 | |
| #define IP_DROP_MEMBERSHIP 36	/* ip_mreq; drop an IP group membership */
 | |
| #define IP_UNBLOCK_SOURCE 37	/* ip_mreq_source: unblock data from source */
 | |
| #define IP_BLOCK_SOURCE 38	/* ip_mreq_source: block data from source */
 | |
| #define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */
 | |
| #define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */
 | |
| #define IP_MSFILTER 41
 | |
| #ifdef __USE_MISC
 | |
| # define MCAST_JOIN_GROUP 42	/* group_req: join any-source group */
 | |
| # define MCAST_BLOCK_SOURCE 43	/* group_source_req: block from given group */
 | |
| # define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/
 | |
| # define MCAST_LEAVE_GROUP 45	/* group_req: leave any-source group */
 | |
| # define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
 | |
| # define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
 | |
| # define MCAST_MSFILTER 48
 | |
| # define IP_MULTICAST_ALL 49
 | |
| # define IP_UNICAST_IF 50
 | |
| 
 | |
| # define MCAST_EXCLUDE   0
 | |
| # define MCAST_INCLUDE   1
 | |
| #endif
 | |
| 
 | |
| #define IP_ROUTER_ALERT	5	/* bool */
 | |
| #define IP_PKTINFO	8	/* bool */
 | |
| #define IP_PKTOPTIONS	9
 | |
| #define IP_PMTUDISC	10	/* obsolete name? */
 | |
| #define IP_MTU_DISCOVER	10	/* int; see below */
 | |
| #define IP_RECVERR	11	/* bool */
 | |
| #define IP_RECVTTL	12	/* bool */
 | |
| #define IP_RECVTOS	13	/* bool */
 | |
| #define IP_MTU		14	/* int */
 | |
| #define IP_FREEBIND	15
 | |
| #define IP_IPSEC_POLICY 16
 | |
| #define IP_XFRM_POLICY	17
 | |
| #define IP_PASSSEC	18
 | |
| #define IP_TRANSPARENT	19
 | |
| #define IP_MULTICAST_ALL 49	/* bool */
 | |
| 
 | |
| /* TProxy original addresses */
 | |
| #define IP_ORIGDSTADDR       20
 | |
| #define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
 | |
| 
 | |
| #define IP_MINTTL       21
 | |
| #define IP_NODEFRAG     22
 | |
| 
 | |
| /* IP_MTU_DISCOVER arguments.  */
 | |
| #define IP_PMTUDISC_DONT   0	/* Never send DF frames.  */
 | |
| #define IP_PMTUDISC_WANT   1	/* Use per route hints.  */
 | |
| #define IP_PMTUDISC_DO     2	/* Always DF.  */
 | |
| #define IP_PMTUDISC_PROBE  3	/* Ignore dst pmtu.  */
 | |
| /* Always use interface mtu (ignores dst pmtu) but don't set DF flag.
 | |
|    Also incoming ICMP frag_needed notifications will be ignored on
 | |
|    this socket to prevent accepting spoofed ones.  */
 | |
| #define IP_PMTUDISC_INTERFACE           4
 | |
| 
 | |
| #define IP_MULTICAST_IF			32
 | |
| #define IP_MULTICAST_TTL 		33
 | |
| #define IP_MULTICAST_LOOP 		34
 | |
| #define IP_ADD_MEMBERSHIP		35
 | |
| #define IP_DROP_MEMBERSHIP		36
 | |
| #define IP_UNBLOCK_SOURCE		37
 | |
| #define IP_BLOCK_SOURCE			38
 | |
| #define IP_ADD_SOURCE_MEMBERSHIP	39
 | |
| #define IP_DROP_SOURCE_MEMBERSHIP	40
 | |
| #define IP_MSFILTER			41
 | |
| #define MCAST_JOIN_GROUP		42
 | |
| #define MCAST_BLOCK_SOURCE		43
 | |
| #define MCAST_UNBLOCK_SOURCE		44
 | |
| #define MCAST_LEAVE_GROUP		45
 | |
| #define MCAST_JOIN_SOURCE_GROUP		46
 | |
| #define MCAST_LEAVE_SOURCE_GROUP	47
 | |
| #define MCAST_MSFILTER			48
 | |
| #define IP_MULTICAST_ALL		49
 | |
| #define IP_UNICAST_IF			50
 | |
| 
 | |
| /* To select the IP level.  */
 | |
| #define SOL_IP	0
 | |
| 
 | |
| #define IP_DEFAULT_MULTICAST_TTL        1
 | |
| #define IP_DEFAULT_MULTICAST_LOOP       1
 | |
| #define IP_MAX_MEMBERSHIPS              20
 | |
| 
 | |
| #ifdef __USE_MISC
 | |
| /* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
 | |
|    The `ip_dst' field is used for the first-hop gateway when using a
 | |
|    source route (this gets put into the header proper).  */
 | |
| struct ip_opts
 | |
|   {
 | |
|     struct in_addr ip_dst;	/* First hop; zero without source route.  */
 | |
|     char ip_opts[40];		/* Actually variable in size.  */
 | |
|   };
 | |
| 
 | |
| /* Like `struct ip_mreq' but including interface specification by index.  */
 | |
| struct ip_mreqn
 | |
|   {
 | |
|     struct in_addr imr_multiaddr;	/* IP multicast address of group */
 | |
|     struct in_addr imr_address;		/* local IP address of interface */
 | |
|     int	imr_ifindex;			/* Interface index */
 | |
|   };
 | |
| 
 | |
| /* Structure used for IP_PKTINFO.  */
 | |
| struct in_pktinfo
 | |
|   {
 | |
|     int ipi_ifindex;			/* Interface index  */
 | |
|     struct in_addr ipi_spec_dst;	/* Routing destination address  */
 | |
|     struct in_addr ipi_addr;		/* Header destination address  */
 | |
|   };
 | |
| #endif
 | |
| 
 | |
| /* Options for use with `getsockopt' and `setsockopt' at the IPv6 level.
 | |
|    The first word in the comment at the right is the data type used;
 | |
|    "bool" means a boolean value stored in an `int'.  */
 | |
| #define IPV6_ADDRFORM		1
 | |
| #define IPV6_2292PKTINFO	2
 | |
| #define IPV6_2292HOPOPTS	3
 | |
| #define IPV6_2292DSTOPTS	4
 | |
| #define IPV6_2292RTHDR		5
 | |
| #define IPV6_2292PKTOPTIONS	6
 | |
| #define IPV6_CHECKSUM		7
 | |
| #define IPV6_2292HOPLIMIT	8
 | |
| 
 | |
| #define SCM_SRCRT		IPV6_RXSRCRT
 | |
| 
 | |
| #define IPV6_NEXTHOP		9
 | |
| #define IPV6_AUTHHDR		10
 | |
| #define IPV6_UNICAST_HOPS	16
 | |
| #define IPV6_MULTICAST_IF	17
 | |
| #define IPV6_MULTICAST_HOPS	18
 | |
| #define IPV6_MULTICAST_LOOP	19
 | |
| #define IPV6_JOIN_GROUP		20
 | |
| #define IPV6_LEAVE_GROUP	21
 | |
| #define IPV6_ROUTER_ALERT	22
 | |
| #define IPV6_MTU_DISCOVER	23
 | |
| #define IPV6_MTU		24
 | |
| #define IPV6_RECVERR		25
 | |
| #define IPV6_V6ONLY		26
 | |
| #define IPV6_JOIN_ANYCAST	27
 | |
| #define IPV6_LEAVE_ANYCAST	28
 | |
| #define IPV6_IPSEC_POLICY	34
 | |
| #define IPV6_XFRM_POLICY	35
 | |
| 
 | |
| #define IPV6_RECVPKTINFO	49
 | |
| #define IPV6_PKTINFO		50
 | |
| #define IPV6_RECVHOPLIMIT	51
 | |
| #define IPV6_HOPLIMIT		52
 | |
| #define IPV6_RECVHOPOPTS	53
 | |
| #define IPV6_HOPOPTS		54
 | |
| #define IPV6_RTHDRDSTOPTS	55
 | |
| #define IPV6_RECVRTHDR		56
 | |
| #define IPV6_RTHDR		57
 | |
| #define IPV6_RECVDSTOPTS	58
 | |
| #define IPV6_DSTOPTS		59
 | |
| 
 | |
| #define IPV6_RECVTCLASS		66
 | |
| #define IPV6_TCLASS		67
 | |
| 
 | |
| /* Obsolete synonyms for the above.  */
 | |
| #define IPV6_ADD_MEMBERSHIP	IPV6_JOIN_GROUP
 | |
| #define IPV6_DROP_MEMBERSHIP	IPV6_LEAVE_GROUP
 | |
| #define IPV6_RXHOPOPTS		IPV6_HOPOPTS
 | |
| #define IPV6_RXDSTOPTS		IPV6_DSTOPTS
 | |
| 
 | |
| /* IPV6_MTU_DISCOVER values.  */
 | |
| #define IPV6_PMTUDISC_DONT	0	/* Never send DF frames.  */
 | |
| #define IPV6_PMTUDISC_WANT	1	/* Use per route hints.  */
 | |
| #define IPV6_PMTUDISC_DO	2	/* Always DF.  */
 | |
| #define IPV6_PMTUDISC_PROBE	3	/* Ignore dst pmtu.  */
 | |
| 
 | |
| /* Socket level values for IPv6.  */
 | |
| #define SOL_IPV6        41
 | |
| #define SOL_ICMPV6      58
 | |
| 
 | |
| /* Routing header options for IPv6.  */
 | |
| #define IPV6_RTHDR_LOOSE	0	/* Hop doesn't need to be neighbour. */
 | |
| #define IPV6_RTHDR_STRICT	1	/* Hop must be a neighbour.  */
 | |
| 
 | |
| #define IPV6_RTHDR_TYPE_0	0	/* IPv6 Routing header type 0.  */
 |