diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-04-08 18:16:09 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-04-08 18:16:09 +0000 |
| commit | fb3227b95caae0d99d0c185099486240a75e2076 (patch) | |
| tree | 959e24b3152a32c79399b13e7cef48b41faab64f /conform | |
| parent | 25dba0ad054723196fb633ba5d8a463ef5cb775c (diff) | |
| download | glibc-fb3227b95caae0d99d0c185099486240a75e2076.tar.gz glibc-fb3227b95caae0d99d0c185099486240a75e2076.tar.xz glibc-fb3227b95caae0d99d0c185099486240a75e2076.zip | |
Fix termios.h XCASE namespace (bug 19925).
bits/termios.h (various versions under sysdeps/unix/sysv/linux) defines XCASE if defined __USE_MISC || defined __USE_XOPEN. This macro was removed in the 2001 edition of POSIX, and is not otherwise reserved, so should not be defined for 2001 and later versions of POSIX. This patch fixes the conditions accordingly (leaving the macro defined for __USE_MISC, so still in the default namespace). Tested for x86_64 and x86 (testsuite, and that installed shared libraries are unchanged by the patch). [BZ #19925] * sysdeps/unix/sysv/linux/alpha/bits/termios.h (XCASE): Do not define if [!__USE_MISC && __USE_XOPEN2K]. * sysdeps/unix/sysv/linux/bits/termios.h (XCASE): Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h (XCASE): Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h (XCASE): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h (XCASE): Likewise. * conform/Makefile (test-xfail-XOPEN2K/termios.h/conform): Remove variable. (test-xfail-XOPEN2K8/termios.h/conform): Likewise.
Diffstat (limited to 'conform')
| -rw-r--r-- | conform/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conform/Makefile b/conform/Makefile index fddeaa1768..ed94ffc735 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -218,7 +218,6 @@ test-xfail-XOPEN2K/signal.h/conform = yes test-xfail-XOPEN2K/stdarg.h/conform = yes test-xfail-XOPEN2K/stdio.h/conform = yes test-xfail-XOPEN2K/sys/wait.h/conform = yes -test-xfail-XOPEN2K/termios.h/conform = yes test-xfail-XOPEN2K/ucontext.h/conform = yes test-xfail-POSIX2008/arpa/inet.h/conform = yes test-xfail-POSIX2008/netdb.h/conform = yes @@ -230,7 +229,6 @@ test-xfail-XOPEN2K8/limits.h/conform = yes test-xfail-XOPEN2K8/signal.h/conform = yes test-xfail-XOPEN2K8/stdio.h/conform = yes test-xfail-XOPEN2K8/sys/wait.h/conform = yes -test-xfail-XOPEN2K8/termios.h/conform = yes conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I.. $(conformtest-header-tests): $(objpfx)%/conform.out: \ |