mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 10:50:07 +00:00
0516e24d18
The conform/ tests test -D_XOPEN_SOURCE under the name "XPG3", and -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED under the name "XPG4". That naming is misleading. _XOPEN_SOURCE_EXTENDED actually means XPG4.2, including UX-shaded interfaces. _XOPEN_SOURCE actually means XPG4, or XPG4.2 without UX-shaded interfaces. (Prior XPG versions also used _XOPEN_SOURCE, but without any versioning of the values of the macro, so XPG4.2 without UX-shaded interfaces is the only sensible set of interfaces for glibc to expose given _XOPEN_SOURCE=1 without _XOPEN_SOURCE_EXTENDED defined.) This patch fixes the naming in the conform/ tests, so that what is now called XPG4 is changed to XPG42, and what is now called XPG3 is changed to XPG4. Tested for x86_64 (and verified the complete set of expectations is unchanged by the patch beyond the intended renaming). * conform/GlibcConform.pm (XPG4): Rename standard to XPG42. (XPG3): Rename standard to XPG4. * conform/Makefile: Likewise. * conform/list-header-symbols.pl: Likewise. * conform/data/aio.h-data: Likewise. * conform/data/arpa/inet.h-data: Likewise. * conform/data/complex.h-data: Likewise. * conform/data/ctype.h-data: Likewise. * conform/data/dlfcn.h-data: Likewise. * conform/data/fcntl.h-data: Likewise. * conform/data/fenv.h-data: Likewise. * conform/data/float.h-data: Likewise. * conform/data/fmtmsg.h-data: Likewise. * conform/data/ftw.h-data: Likewise. * conform/data/grp.h-data: Likewise. * conform/data/inttypes.h-data: Likewise. * conform/data/iso646.h-data: Likewise. * conform/data/langinfo.h-data: Likewise. * conform/data/libgen.h-data: Likewise. * conform/data/limits.h-data: Likewise. * conform/data/locale.h-data: Likewise. * conform/data/math.h-data: Likewise. * conform/data/mqueue.h-data: Likewise. * conform/data/ndbm.h-data: Likewise. * conform/data/net/if.h-data: Likewise. * conform/data/netdb.h-data: Likewise. * conform/data/netinet/in.h-data: Likewise. * conform/data/poll.h-data: Likewise. * conform/data/pthread.h-data: Likewise. * conform/data/pwd.h-data: Likewise. * conform/data/sched.h-data: Likewise. * conform/data/search.h-data: Likewise. * conform/data/semaphore.h-data: Likewise. * conform/data/signal.h-data: Likewise. * conform/data/spawn.h-data: Likewise. * conform/data/stdbool.h-data: Likewise. * conform/data/stdint.h-data: Likewise. * conform/data/stdio.h-data: Likewise. * conform/data/stdlib.h-data: Likewise. * conform/data/string.h-data: Likewise. * conform/data/strings.h-data: Likewise. * conform/data/stropts.h-data: Likewise. * conform/data/sys/mman.h-data: Likewise. * conform/data/sys/resource.h-data: Likewise. * conform/data/sys/select.h-data: Likewise. * conform/data/sys/socket.h-data: Likewise. * conform/data/sys/stat.h-data: Likewise. * conform/data/sys/statvfs.h-data: Likewise. * conform/data/sys/time.h-data: Likewise. * conform/data/sys/timeb.h-data: Likewise. * conform/data/sys/types.h-data: Likewise. * conform/data/sys/uio.h-data: Likewise. * conform/data/sys/un.h-data: Likewise. * conform/data/sys/wait.h-data: Likewise. * conform/data/syslog.h-data: Likewise. * conform/data/termios.h-data: Likewise. * conform/data/tgmath.h-data: Likewise. * conform/data/time.h-data: Likewise. * conform/data/ucontext.h-data: Likewise. * conform/data/unistd.h-data: Likewise. * conform/data/utmpx.h-data: Likewise. * conform/data/varargs.h-data: Likewise. * conform/data/wchar.h-data: Likewise. * conform/data/wctype.h-data: Likewise.
96 lines
2.1 KiB
Plaintext
96 lines
2.1 KiB
Plaintext
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4
|
|
type in_port_t
|
|
type in_addr_t
|
|
|
|
type sa_family_t
|
|
|
|
type {struct in_addr}
|
|
|
|
element {struct in_addr} in_addr_t s_addr
|
|
|
|
type {struct sockaddr_in}
|
|
|
|
element {struct sockaddr_in} sa_family_t sin_family
|
|
element {struct sockaddr_in} in_port_t sin_port
|
|
element {struct sockaddr_in} {struct in_addr} sin_addr
|
|
element {struct sockaddr_in} {unsigned char} sin_zero [8]
|
|
|
|
type {struct in6_addr}
|
|
|
|
element {struct in6_addr} uint8_t s6_addr [16]
|
|
|
|
type {struct sockaddr_in6}
|
|
|
|
element {struct sockaddr_in6} sa_family_t sin6_family
|
|
element {struct sockaddr_in6} in_port_t sin6_port
|
|
element {struct sockaddr_in6} uint32_t sin6_flowinfo
|
|
element {struct sockaddr_in6} {struct in6_addr} sin6_addr
|
|
element {struct sockaddr_in6} uint32_t sin6_scope_id
|
|
|
|
variable {const struct in6_addr} in6addr_any
|
|
|
|
// constant IN6ADDR_ANY_INIT
|
|
macro IN6ADDR_ANY_INIT
|
|
|
|
variable {const struct in6_addr} in6addr_loopback
|
|
|
|
// constant IN6ADDR_LOOPBACK_INIT
|
|
macro IN6ADDR_LOOPBACK_INIT
|
|
|
|
type {struct ipv6_mreq}
|
|
|
|
element {struct ipv6_mreq} {struct in6_addr} ipv6mr_multiaddr
|
|
element {struct ipv6_mreq} {unsigned int} ipv6mr_interface
|
|
|
|
macro IPPROTO_IP
|
|
macro IPPROTO_IPV6
|
|
macro IPPROTO_ICMP
|
|
macro IPPROTO_TCP
|
|
macro IPPROTO_UDP
|
|
|
|
macro INADDR_ANY
|
|
macro INADDR_BROADCAST
|
|
|
|
constant INET_ADDRSTRLEN == 16
|
|
|
|
function uint32_t htonl (uint32_t)
|
|
function uint16_t htons (uint16_t)
|
|
function uint32_t ntohl (uint32_t)
|
|
function uint16_t ntohs (uint16_t)
|
|
|
|
allow-header inttypes.h
|
|
allow-header sys/socket.h
|
|
|
|
constant INET6_ADDRSTRLEN == 46
|
|
|
|
macro IPV6_JOIN_GROUP
|
|
macro IPV6_LEAVE_GROUP
|
|
macro IPV6_MULTICAST_HOPS
|
|
macro IPV6_MULTICAST_IF
|
|
macro IPV6_MULTICAST_LOOP
|
|
macro IPV6_UNICAST_HOPS
|
|
|
|
macro IN6_IS_ADDR_UNSPECIFIED
|
|
macro IN6_IS_ADDR_LOOPBACK
|
|
macro IN6_IS_ADDR_MULTICAST
|
|
macro IN6_IS_ADDR_LINKLOCAL
|
|
macro IN6_IS_ADDR_SITELOCAL
|
|
macro IN6_IS_ADDR_V4MAPPED
|
|
macro IN6_IS_ADDR_V4COMPAT
|
|
macro IN6_IS_ADDR_MC_NODELOCAL
|
|
macro IN6_IS_ADDR_MC_LINKLOCAL
|
|
macro IN6_IS_ADDR_MC_SITELOCAL
|
|
macro IN6_IS_ADDR_MC_ORGLOCAL
|
|
macro IN6_IS_ADDR_MC_GLOBAL
|
|
|
|
allow IMPLINK_*
|
|
allow IN_*
|
|
allow IN6_*
|
|
allow INADDR_*
|
|
allow IP_*
|
|
allow IPV6_*
|
|
allow IPPORT_*
|
|
allow IPPROTO_*
|
|
allow SOCK_*
|
|
#endif
|