From patchwork Thu May 15 21:43:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 349370 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 6ECD91400B2 for ; Fri, 16 May 2014 07:43:26 +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=WNkpVZ2ht/5S6DZzdf5BBYUcrjWcx sOW0GEp6t5o+X3uoOII2QtESl1Z9qbe+CVOQAQ9Y5BvhPDfJsr2XP+JjdVcEDogv QHylndhHAB9C84f8XegUxH7DAEP2xKQ7sVjxZdgDNgahTS9KuAGpiB2MT/j9iyJZ t08A3JN/fNPKdo= 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=0P0qEWiJzRDMo0B6r1T6n3/idb8=; b=oSu +S3+4f2j7s8NOR3mrRo3DlVwb12mskrxz1unz49Eqko1PtFojPtK0OrsRfC3kfqW Cu0xo0XZfRSnN61N3426fs4uPdTSjgrCz5EaNpjBRu9+QOpf+vA0V7J1BoKbu3qi CPD+7WJQpHQtZdcGG2f97v1pQqkfwkgBdHF0HTPY= Received: (qmail 27507 invoked by alias); 15 May 2014 21:43:21 -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 27498 invoked by uid 89); 15 May 2014 21:43:20 -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, 15 May 2014 21:43:05 +0000 From: "Joseph S. Myers" To: Subject: conformtest: clean up POSIX expectations for sys/mman.h, sys/stat.h, sys/types.h Message-ID: MIME-Version: 1.0 Continuing the series of patches to clean up conformtest expectations for "POSIX" (1995/6) based on review of the expectations against the standard, this patch cleans up expectations for sys/mman.h, sys/stat.h and sys/types.h. Tested x86_64; no new XFAILs needed. 2014-05-15 Joseph Myers * conform/data/sys/mman.h-data [POSIX] (size_t): Do not require type. [POSIX] (off_t): Likewise. * conform/data/sys/stat.h-data (S_IRGRP): Require constant. [POSIX] (S_ISBLK): Require macro. [POSIX] (S_ISCHR): Likewise. [POSIX] (S_ISDIR): Likewise. [POSIX] (S_ISFIFO): Likewise. [POSIX] (S_ISREG): Likewise. [POSIX || XPG3 || XPG4 || UNIX98] (S_TYPEISTMO): Do not list optional-macro. * conform/data/sys/types.h-data [POSIX] (blkcnt_t): Do not require type. [POSIX] (time_t): Likewise. [POSIX] (timer_t): Likewise. diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data index 0555fd1..3a88684 100644 --- a/conform/data/sys/mman.h-data +++ b/conform/data/sys/mman.h-data @@ -39,8 +39,10 @@ optional-function int posix_typed_mem_get_info (int, struct posix_typed_mem_info optional-function int posix_typed_mem_open (const char*, int, int) # endif +# ifndef POSIX type size_t type off_t +# endif function int mlock (const void*, size_t) function int mlockall (int) diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data index 41c3932..631daa4 100644 --- a/conform/data/sys/stat.h-data +++ b/conform/data/sys/stat.h-data @@ -66,6 +66,7 @@ constant S_IRUSR constant S_IWUSR constant S_IXUSR constant S_IRWXG +constant S_IRGRP constant S_IWGRP constant S_IXGRP constant S_IRWXO @@ -78,12 +79,12 @@ constant S_ISGID constant S_ISVTX #endif -#if !defined POSIX macro S_ISBLK macro S_ISCHR macro S_ISDIR macro S_ISFIFO macro S_ISREG +#if !defined POSIX macro S_ISLNK macro S_ISSOCK #endif @@ -92,7 +93,9 @@ macro S_ISSOCK optional-macro S_TYPEISMQ optional-macro S_TYPEISSEM optional-macro S_TYPEISSHM +# if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 optional-macro S_TYPEISTMO +# endif # if defined XOPEN2K8 || defined POSIX2008 constant UTIME_NOW diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data index cda1954..36c5efa 100644 --- a/conform/data/sys/types.h-data +++ b/conform/data/sys/types.h-data @@ -1,6 +1,6 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 -type blkcnt_t #if !defined POSIX +type blkcnt_t type blksize_t type clock_t type clockid_t @@ -48,8 +48,10 @@ type ssize_t # if !defined POSIX && !defined POSIX2008 type suseconds_t # endif +# ifndef POSIX type time_t type timer_t +# endif type uid_t allow *_t