Fix netinet/in.h MCAST_* namespace (bug 18558).
commitd1ac55d89023f86a34e46e9f064746334014ae28
authorJoseph Myers <joseph@codesourcery.com>
Thu, 18 Jun 2015 19:48:22 +0000 (18 19:48 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Thu, 18 Jun 2015 19:48:22 +0000 (18 19:48 +0000)
treee0b8f89a6f22b4d9781bfa9dcb092a0f94b20df6
parenta6336cc446a7ed682cb9dbc47cc56ebf9f9a4229
Fix netinet/in.h MCAST_* namespace (bug 18558).

sysdeps/unix/sysv/linux/bits/in.h (as included in netinet/in.h, and
via that in netdb.h and arpa/inet.h) defines a series of MCAST_*
macros, both under __USE_MISC and then again unconditionally.  These
are not POSIX macros, nor in any of the namespaces listed in POSIX as
reserved for this header, so should not be defined unconditionally.
This patch duly removes the unconditional definitions, leaving the
ones conditional on __USE_MISC.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

[BZ #18558]
* sysdeps/unix/sysv/linux/bits/in.h (MCAST_JOIN_GROUP): Remove
unconditional definition.
(MCAST_BLOCK_SOURCE): Likewise.
(MCAST_UNBLOCK_SOURCE): Likewise.
(MCAST_LEAVE_GROUP): Likewise.
(MCAST_JOIN_SOURCE_GROUP): Likewise.
(MCAST_LEAVE_SOURCE_GROUP): Likewise.
(MCAST_MSFILTER): Likewise.
* conform/Makefile (test-xfail-XOPEN2K/arpa/inet.h/conform):
Remove variable.
(test-xfail-XOPEN2K/netdb.h/conform): Likewise.
(test-xfail-XOPEN2K/netinet/in.h/conform): Likewise.
(test-xfail-XOPEN2K8/arpa/inet.h/conform): Likewise.
(test-xfail-XOPEN2K8/netdb.h/conform): Likewise.
(test-xfail-XOPEN2K8/netinet/in.h/conform): Likewise.
ChangeLog
NEWS
conform/Makefile
sysdeps/unix/sysv/linux/bits/in.h