diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-18 19:48:22 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-18 19:48:22 +0000 |
| commit | d1ac55d89023f86a34e46e9f064746334014ae28 (patch) | |
| tree | e0b8f89a6f22b4d9781bfa9dcb092a0f94b20df6 /conform | |
| parent | a6336cc446a7ed682cb9dbc47cc56ebf9f9a4229 (diff) | |
| download | glibc-d1ac55d89023f86a34e46e9f064746334014ae28.zip glibc-d1ac55d89023f86a34e46e9f064746334014ae28.tar.gz glibc-d1ac55d89023f86a34e46e9f064746334014ae28.tar.bz2 | |
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.
Diffstat (limited to 'conform')
| -rw-r--r-- | conform/Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/conform/Makefile b/conform/Makefile index 4bc8121..30eaa64 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -231,13 +231,10 @@ test-xfail-UNIX98/ucontext.h/conform = yes test-xfail-UNIX98/unistd.h/conform = yes test-xfail-UNIX98/utmpx.h/conform = yes test-xfail-XOPEN2K/aio.h/conform = yes -test-xfail-XOPEN2K/arpa/inet.h/conform = yes test-xfail-XOPEN2K/fcntl.h/conform = yes test-xfail-XOPEN2K/langinfo.h/conform = yes test-xfail-XOPEN2K/math.h/conform = yes test-xfail-XOPEN2K/mqueue.h/conform = yes -test-xfail-XOPEN2K/netdb.h/conform = yes -test-xfail-XOPEN2K/netinet/in.h/conform = yes test-xfail-XOPEN2K/semaphore.h/conform = yes test-xfail-XOPEN2K/signal.h/conform = yes test-xfail-XOPEN2K/stdarg.h/conform = yes @@ -261,12 +258,9 @@ test-xfail-POSIX2008/signal.h/conform = yes test-xfail-POSIX2008/stropts.h/conform = yes test-xfail-POSIX2008/sys/socket.h/conform = yes test-xfail-POSIX2008/sys/wait.h/conform = yes -test-xfail-XOPEN2K8/arpa/inet.h/conform = yes test-xfail-XOPEN2K8/fcntl.h/conform = yes test-xfail-XOPEN2K8/limits.h/conform = yes test-xfail-XOPEN2K8/math.h/conform = yes -test-xfail-XOPEN2K8/netdb.h/conform = yes -test-xfail-XOPEN2K8/netinet/in.h/conform = yes test-xfail-XOPEN2K8/signal.h/conform = yes test-xfail-XOPEN2K8/stdio.h/conform = yes test-xfail-XOPEN2K8/stropts.h/conform = yes |