From patchwork Wed Sep 17 12:55:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 390380 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 D55C81400F4 for ; Wed, 17 Sep 2014 22:56:00 +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:cc:subject:message-id:references :mime-version:content-type:in-reply-to; q=dns; s=default; b=Snfo loitoBDBYsG1Ww/zoKdGTg64/LnzEauMj61+UJmFww8cg+alYM3on8VxR5G5SkGG kDlgp988V1eQx/D/wfHvdMcUNqYQbxFxCkAgpIIhfLLCEkJpoGnMSejiKIHNy26q 2UMU5/x+lnBZ+n51++f68i2fin/0d6QxPBETnaw= 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:cc:subject:message-id:references :mime-version:content-type:in-reply-to; s=default; bh=5tPIWkoEJZ q9DuR5e644iMqc9cg=; b=PoWji/my4nAXPz0B1W118Dg78w3Lru1cwehw2YNx00 dQYJwDByDuOkAm/n1jxUgriNdFGmxuSyMhzHOdDdVo6bz6InHG0tRpqX1uhkqQ5r C8Wf6J/DzTZ9yYdF92dTYX5aOG0tAE9HD44VRXQWHpCn3JEsaLnr2BTgWNLbt2N1 Y= Received: (qmail 18961 invoked by alias); 17 Sep 2014 12:55:55 -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 18900 invoked by uid 89); 17 Sep 2014 12:55:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Wed, 17 Sep 2014 18:25:43 +0530 From: Siddhesh Poyarekar To: "Joseph S. Myers" Cc: libc-alpha@sourceware.org Subject: [ping][PATCH 17/17 v3] Use IS_IN internally only Message-ID: <20140917125543.GX6586@spoyarek.pnq.redhat.com> References: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> <1408618663-2281-18-git-send-email-siddhesh@redhat.com> <20140828065509.GI8020@spoyarek.pnq.redhat.com> <20140901165929.GJ4395@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140901165929.GJ4395@spoyarek.pnq.redhat.com> User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) Rebased patch against latest master. The patch has not changed. Siddhesh From f45abf4b96388f82ba2cb7cba8548aa71a8e607d Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 1 Sep 2014 22:55:04 +0530 Subject: [PATCH] Use IS_IN internally only This change is only useful for the conformance tests since the headers changed are not installed. The conformance tests fail due to IS_IN not being defined, so wrap it with a check to make sure that _ISOMAC is defined. * include/bits/stdlib-float.h [_ISOMAC || !IS_IN (rtld)]: Include bits/stdlib-float.h. * include/mqueue.h: Use internal code only when _ISOMAC is not defined. --- include/bits/stdlib-float.h | 8 ++++++-- include/mqueue.h | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h index 3466314..54ab571 100644 --- a/include/bits/stdlib-float.h +++ b/include/bits/stdlib-float.h @@ -1,4 +1,8 @@ -/* No floating-point inline functions in rtld. */ -#if !IS_IN (rtld) +/* No floating-point inline functions in rtld and for the conform tests. */ +#ifdef _ISOMAC # include +#else +# if !IS_IN (rtld) +# include +# endif #endif diff --git a/include/mqueue.h b/include/mqueue.h index aba788e..eb47b9b 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -1,7 +1,9 @@ #include -#if IS_IN (librt) +#ifndef _ISOMAC +# if IS_IN (librt) hidden_proto (mq_timedsend) hidden_proto (mq_timedreceive) hidden_proto (mq_setattr) +# endif #endif