From patchwork Mon Mar 17 15:15:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 331055 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 5D6CC2C0099 for ; Tue, 18 Mar 2014 02:15:29 +1100 (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=l4iQdOKSKMvqGhSUQ0maB5v4E2+G1 Ho8PwrsuiPjt68KZRUUcxhCZR6FRhS9b1M0wh1i88zdAluXW1QCD9+qn8CqPofQ9 JsGEKGD6XAY7d+GDqAVjq3vHxYxlbwJOG6IotUkYiQK8iX+VZqFbUafFWuwQy26O 9Q1CEGTwSiK0DA= 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=aLpAIAV/lHqis1EeQnTtbZnrpiM=; b=x8s SCWZOkmilk/Rxhvyikg+8fhY8kIze0lBXP1Wwf03rjrpyTXJpssR3F30x92XgXzv HHFzjS22ICvbFSsIxbZ2j3K9mcgu4Twintk1CUMzRsR7bzOoz4uL1QddhD+pqLnB EqYtmdx8qpvnP3dezphWgiy780mUJcyHY85gQA3E= Received: (qmail 30654 invoked by alias); 17 Mar 2014 15:15:22 -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 30642 invoked by uid 89); 17 Mar 2014 15:15:22 -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: Mon, 17 Mar 2014 15:15:13 +0000 From: "Joseph S. Myers" To: Subject: conformtest: clean up POSIX expectations for stdlib.h, string.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 stdlib.h and string.h. Tested x86_64; no new XFAILs needed. 2014-03-17 Joseph Myers * conform/data/stdlib.h-data [POSIX] (stddef.h): Do not allow header inclusion. [POSIX] (limits.h): Likewise. [POSIX] (math.h): Likewise. [POSIX] (sys/wait.h): Likewise. * conform/data/string.h-data [POSIX || UNIX98] (strtok_r): Require function. [POSIX] (stddef.h): Do not allow header inclusion. diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data index 382fff6..abe296a 100644 --- a/conform/data/stdlib.h-data +++ b/conform/data/stdlib.h-data @@ -177,7 +177,7 @@ function {void*} valloc (size_t) function size_t wcstombs (char*, const wchar_t*, size_t) function int wctomb (char*, wchar_t) -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX allow-header stddef.h allow-header limits.h allow-header math.h diff --git a/conform/data/string.h-data b/conform/data/string.h-data index 365a537..cc3b1c9 100644 --- a/conform/data/string.h-data +++ b/conform/data/string.h-data @@ -53,7 +53,7 @@ function {char*} strsignal (int) function size_t strspn (const char*, const char*) function {char*} strstr (const char*, const char*) function {char*} strtok (char*, const char*) -#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 +#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008 function {char*} strtok_r (char*, const char*, char**) #endif function size_t strxfrm (char*, const char*, size_t) @@ -61,7 +61,7 @@ function size_t strxfrm (char*, const char*, size_t) function size_t strxfrm_l (char*, const char*, size_t, locale_t) #endif -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX allow-header stddef.h #endif