mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08: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.
141 lines
3.1 KiB
Plaintext
141 lines
3.1 KiB
Plaintext
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4
|
|
type socklen_t
|
|
|
|
type sa_family_t
|
|
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
type size_t
|
|
type ssize_t
|
|
# endif
|
|
|
|
type {struct sockaddr}
|
|
|
|
element {struct sockaddr} sa_family_t sa_family
|
|
element {struct sockaddr} char sa_data []
|
|
|
|
type {struct sockaddr_storage}
|
|
|
|
element {struct sockaddr_storage} sa_family_t ss_family
|
|
|
|
type {struct msghdr}
|
|
|
|
element {struct msghdr} {void*} msg_name
|
|
element {struct msghdr} socklen_t msg_namelen
|
|
element {struct msghdr} {struct iovec*} msg_iov
|
|
// Bug 16919: wrong type for msg_iovlen and msg_controllen members.
|
|
xfail-element {struct msghdr} int msg_iovlen
|
|
element {struct msghdr} {void*} msg_control
|
|
xfail-element {struct msghdr} socklen_t msg_controllen
|
|
element {struct msghdr} int msg_flags
|
|
|
|
type {struct iovec}
|
|
|
|
element {struct iovec} {void*} iov_base
|
|
element {struct iovec} size_t iov_len
|
|
|
|
type {struct cmsghdr}
|
|
|
|
// Bug 16919: wrong type for cmsg_len member.
|
|
xfail-element {struct cmsghdr} socklen_t cmsg_len
|
|
element {struct cmsghdr} int cmsg_level
|
|
element {struct cmsghdr} int cmsg_type
|
|
|
|
macro SCM_RIGHTS
|
|
|
|
macro CMSG_DATA
|
|
macro CMSG_NXTHDR
|
|
macro CMSG_FIRSTHDR
|
|
|
|
type {struct linger}
|
|
|
|
element {struct linger} int l_onoff
|
|
element {struct linger} int l_linger
|
|
|
|
macro SOCK_DGRAM
|
|
macro SOCK_STREAM
|
|
macro SOCK_SEQPACKET
|
|
|
|
macro SOL_SOCKET
|
|
|
|
macro SO_ACCEPTCONN
|
|
macro SO_BROADCAST
|
|
macro SO_DEBUG
|
|
macro SO_DONTROUTE
|
|
macro SO_ERROR
|
|
macro SO_KEEPALIVE
|
|
macro SO_LINGER
|
|
macro SO_OOBINLINE
|
|
macro SO_RCVBUF
|
|
macro SO_RCVLOWAT
|
|
macro SO_RCVTIMEO
|
|
macro SO_REUSEADDR
|
|
macro SO_SNDBUF
|
|
macro SO_SNDLOWAT
|
|
macro SO_SNDTIMEO
|
|
macro SO_TYPE
|
|
|
|
macro SOMAXCONN
|
|
|
|
macro MSG_CTRUNC
|
|
macro MSG_DONTROUTE
|
|
macro MSG_EOR
|
|
macro MSG_OOB
|
|
macro MSG_PEEK
|
|
macro MSG_TRUNC
|
|
macro MSG_WAITALL
|
|
# if defined XOPEN2K8 || defined POSIX2008
|
|
constant MSG_NOSIGNAL
|
|
# endif
|
|
|
|
macro AF_UNIX
|
|
macro AF_UNSPEC
|
|
macro AF_INET
|
|
macro AF_INET6
|
|
|
|
macro SHUT_RD
|
|
macro SHUT_WR
|
|
macro SHUT_RDWR
|
|
|
|
function int accept (int, struct sockaddr*, socklen_t*)
|
|
function int bind (int, const struct sockaddr*, socklen_t)
|
|
function int connect (int, const struct sockaddr*, socklen_t)
|
|
function int getpeername (int, struct sockaddr*, socklen_t*)
|
|
function int getsockname (int, struct sockaddr*, socklen_t*)
|
|
function int getsockopt (int, int, int, void*, socklen_t*)
|
|
function int listen (int, int)
|
|
function ssize_t recv (int, void*, size_t, int)
|
|
function ssize_t recvfrom (int, void*, size_t, int, struct sockaddr*, socklen_t*)
|
|
function ssize_t recvmsg (int, struct msghdr*, int)
|
|
function ssize_t send (int, const void*, size_t, int)
|
|
function ssize_t sendmsg (int, const struct msghdr*, int)
|
|
function ssize_t sendto (int, const void*, size_t, int, const struct sockaddr*, socklen_t)
|
|
function int setsockopt (int, int, int, const void*, socklen_t)
|
|
function int shutdown (int, int)
|
|
function int socket (int, int, int)
|
|
function int socketpair (int, int, int, int[2])
|
|
#if !defined XPG42 && !defined UNIX98
|
|
function int sockatmark (int)
|
|
#endif
|
|
|
|
allow-header sys/uio.h
|
|
|
|
allow ss_*
|
|
allow sa_*
|
|
allow if_*
|
|
allow ifc_*
|
|
allow ifru_*
|
|
allow infu_*
|
|
allow ifra_*
|
|
allow msg_*
|
|
allow cmsg_*
|
|
allow l_*
|
|
allow SO*
|
|
allow AF_*
|
|
allow CMSG_*
|
|
allow MSG_*
|
|
allow PF_*
|
|
allow SCM_*
|
|
allow SHUT_*
|
|
allow *_t
|
|
#endif
|