From patchwork Thu May 22 23:20:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 351663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EBD01140084 for ; Fri, 23 May 2014 09:20:16 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=LraWp8AEMBPcyQnbDn40bDx40sDBH +lfeprOQd1Tl0ZeVEJX5xpuf4XfhiY1dkbhnyWhqbjQpGUiKvwtFp2Z+NO2dLgmw uz16Whg5sVW9MMX5RPjTi3VRo3KXrYPEU6b0ljYmFCrRSIt9iFAyBhggm7D2MJwJ c84L22rfdW5g9E= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=IP81XZrMfjuH4QU2EQffDIx+JM0=; b=DX+ KgII5tUZ109MLGCZHzioIIgfDoiBAJZ/z9dPLN59tnQFdXuanCy7IcewNyas3ozk UhOwW6sWWhNCYSC/PHa9nkd6Hmd6RPTBq7Sh987MBnfbQ/0/m7e30BrBh32tRgKW Ca17T9kvKuG/R2OeClHfFBn8lk+X19Zud+Ejogvo= Received: (qmail 18014 invoked by alias); 22 May 2014 23:20:10 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 17995 invoked by uid 89); 22 May 2014 23:20:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Thu, 22 May 2014 23:20:02 +0000 From: "Joseph S. Myers" To: Subject: Define TSVTX in tar.h for older POSIX (bug 16978) Message-ID: MIME-Version: 1.0 As noted in bug 16978, older POSIX versions include #define TSVTX 01000 /* Reserved */ 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. 2014-05-22 Joseph Myers [BZ #16978] * posix/tar.h [!__USE_XOPEN2K] (TSVTX): Define macro. * conform/Makefile (test-xfail-POSIX/tar.h/conform): Remove variable. 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