From e59252a58edad4bf74a094e22a70811d5585c60f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 23 May 2014 20:37:40 +0000 Subject: [PATCH] Define TSVTX in tar.h for older POSIX (bug 16978). As noted in bug 16978, older POSIX versions include in the specified contents of , with only the 2001 edition introducing the notion of XSI-conditional definitions and conditioning that definition. Thus, this macro should be defined for !__USE_XOPEN2K as well as for __USE_XOPEN, and this patch duly defines it in that case. Tested x86_64. [BZ #16978] * posix/tar.h [!__USE_XOPEN2K] (TSVTX): Define macro. * conform/Makefile (test-xfail-POSIX/tar.h/conform): Remove variable. --- ChangeLog | 7 +++++++ NEWS | 2 +- conform/Makefile | 1 - posix/tar.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a53317..3ea921b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-05-23 Joseph Myers + + [BZ #16978] + * posix/tar.h [!__USE_XOPEN2K] (TSVTX): Define macro. + * conform/Makefile (test-xfail-POSIX/tar.h/conform): Remove + variable. + 2014-05-23 Richard Henderson * sysdeps/unix/sysv/linux/alpha/nptl/Makefile: Merge into... diff --git a/NEWS b/NEWS index 1c44fd6..85b140c 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,7 @@ Version 2.20 16760, 16770, 16786, 16789, 16791, 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16849, 16854, 16876, 16877, 16885, 16888, 16890, 16912, 16915, 16916, 16917, 16922, 16927, 16928, 16932, 16943, 16958, 16966, - 16967, 16965, 16977. + 16967, 16965, 16977, 16978. * The minimum Linux kernel version that this version of the GNU C Library can be used with is 2.6.32. diff --git a/conform/Makefile b/conform/Makefile index e1df914..6bff8a3 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -188,7 +188,6 @@ test-xfail-XPG4/termios.h/conform = yes test-xfail-XPG4/ucontext.h/conform = yes test-xfail-XPG4/unistd.h/conform = yes test-xfail-XPG4/utmpx.h/conform = yes -test-xfail-POSIX/tar.h/conform = yes test-xfail-UNIX98/arpa/inet.h/conform = yes test-xfail-UNIX98/fcntl.h/conform = yes test-xfail-UNIX98/langinfo.h/conform = yes diff --git a/posix/tar.h b/posix/tar.h index 115f4df..5a86f01 100644 --- a/posix/tar.h +++ b/posix/tar.h @@ -73,7 +73,7 @@ /* The bits in mode: */ #define TSUID 04000 #define TSGID 02000 -#ifdef __USE_XOPEN +#if defined __USE_XOPEN || !defined __USE_XOPEN2K # define TSVTX 01000 #endif #define TUREAD 00400 -- 2.7.4