From patchwork Mon Sep 1 16:59:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2619 Received: (qmail 30417 invoked by alias); 1 Sep 2014 16:59:39 -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 30405 invoked by uid 89); 1 Sep 2014 16:59:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.2 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: Mon, 1 Sep 2014 22:29:30 +0530 From: Siddhesh Poyarekar To: "Joseph S. Myers" Cc: libc-alpha@sourceware.org Subject: [PATCH 17/19 v3] Use IS_IN only when _LIBC is defined Message-ID: <20140901165929.GJ4395@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> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) On Thu, Aug 28, 2014 at 04:58:26PM +0000, Joseph S. Myers wrote: > Normally, #ifndef _ISOMAC would be the conditional around such extra > internal-only contents (and then #if IS_IN (librt) could go inside the > !_ISOMAC case). Thanks, I wasn't clear about the _ISOMAC macro usage. Updated patch, no change in generated code and the conformtests are fixed. Siddhesh * include/bits/stdlib-float.h: Use IS_IN only if _LIBC is defined. * include/mqueue.h: Likewise. * include/stdlib.h: Likewise. 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