mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 13:10:29 +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.
119 lines
3.2 KiB
Plaintext
119 lines
3.2 KiB
Plaintext
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4
|
|
optional-type in_port_t
|
|
optional-type in_addr_t
|
|
|
|
type {struct hostent}
|
|
|
|
element {struct hostent} {char*} h_name
|
|
element {struct hostent} {char**} h_aliases
|
|
element {struct hostent} int h_addrtype
|
|
element {struct hostent} int h_length
|
|
element {struct hostent} {char**} h_addr_list
|
|
|
|
type {struct netent}
|
|
|
|
element {struct netent} {char*} n_name
|
|
element {struct netent} {char**} n_aliases
|
|
element {struct netent} int n_addrtype
|
|
// Bug 21260: n_net has wrong type.
|
|
xfail[alpha-linux]-element {struct netent} uint32_t n_net
|
|
|
|
type uint32_t
|
|
|
|
type {struct protoent}
|
|
|
|
element {struct protoent} {char*} p_name
|
|
element {struct protoent} {char**} p_aliases
|
|
element {struct protoent} int p_proto
|
|
|
|
type {struct servent}
|
|
|
|
element {struct servent} {char*} s_name
|
|
element {struct servent} {char**} s_aliases
|
|
element {struct servent} int s_port
|
|
element {struct servent} {char*} s_proto
|
|
|
|
macro IPPORT_RESERVED
|
|
|
|
#if !defined XOPEN2K8 && !defined POSIX2008
|
|
// variable int h_errno
|
|
allow h_errno
|
|
|
|
macro HOST_NOT_FOUND
|
|
macro NO_DATA
|
|
macro NO_RECOVERY
|
|
macro TRY_AGAIN
|
|
#endif
|
|
|
|
#if !defined XPG42 && !defined UNIX98
|
|
type {struct addrinfo}
|
|
element {struct addrinfo} int ai_flags
|
|
element {struct addrinfo} int ai_family
|
|
element {struct addrinfo} int ai_socktype
|
|
element {struct addrinfo} int ai_protocol
|
|
element {struct addrinfo} socklen_t ai_addrlen
|
|
element {struct addrinfo} {struct sockaddr*} ai_addr
|
|
element {struct addrinfo} {char*} ai_canonname
|
|
element {struct addrinfo} {struct addrinfo*} ai_next
|
|
|
|
macro AI_PASSIVE
|
|
macro AI_CANONNAME
|
|
macro AI_NUMERICHOST
|
|
macro AI_V4MAPPED
|
|
macro AI_ALL
|
|
macro AI_ADDRCONFIG
|
|
macro AI_NUMERICSERV
|
|
|
|
macro NI_NOFQDN
|
|
macro NI_NUMERICHOST
|
|
macro NI_NAMEREQD
|
|
macro NI_NUMERICSERV
|
|
macro NI_DGRAM
|
|
|
|
macro EAI_AGAIN
|
|
macro EAI_BADFLAGS
|
|
macro EAI_FAIL
|
|
macro EAI_FAMILY
|
|
macro EAI_MEMORY
|
|
macro EAI_NONAME
|
|
macro EAI_SERVICE
|
|
macro EAI_SOCKTYPE
|
|
macro EAI_SYSTEM
|
|
macro EAI_OVERFLOW
|
|
#endif
|
|
|
|
function void endhostent (void)
|
|
function void endnetent (void)
|
|
function void endprotoent (void)
|
|
function void endservent (void)
|
|
#if !defined XPG42 && !defined UNIX98
|
|
function void freeaddrinfo (struct addrinfo*)
|
|
function {const char*} gai_strerror (int)
|
|
function int getaddrinfo (const char*, const char*, const struct addrinfo*, struct addrinfo**)
|
|
#endif
|
|
function {struct hostent*} gethostbyaddr (const void*, socklen_t, int)
|
|
function {struct hostent*} gethostbyname (const char*)
|
|
function {struct hostent*} gethostent (void)
|
|
#if !defined XPG42 && !defined UNIX98
|
|
function int getnameinfo (const struct sockaddr*, socklen_t, char*, socklen_t, char*, socklen_t, int)
|
|
#endif
|
|
function {struct netent*} getnetbyaddr (uint32_t, int)
|
|
function {struct netent*} getnetbyname (const char*)
|
|
function {struct netent*} getnetent (void)
|
|
function {struct protoent*} getprotobyname (const char *)
|
|
function {struct protoent*} getprotobynumber (int)
|
|
function {struct protoent*} getprotoent (void)
|
|
function {struct servent*} getservbyname (const char*, const char*)
|
|
function {struct servent*} getservbyport (int, const char*)
|
|
function {struct servent*} getservent (void)
|
|
function void sethostent (int)
|
|
function void setnetent (int)
|
|
function void setprotoent (int)
|
|
function void setservent (int)
|
|
|
|
type socklen_t
|
|
|
|
allow-header netinet/in.h
|
|
allow-header inttypes.h
|
|
#endif
|