From patchwork Thu Aug 21 10:57:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2501 Received: (qmail 21402 invoked by alias); 21 Aug 2014 11:37: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 21391 invoked by uid 89); 21 Aug 2014 11:37:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_50, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: Siddhesh Poyarekar Subject: [PATCH 07/19] Remove IS_IN_libc Date: Thu, 21 Aug 2014 16:27:31 +0530 Message-Id: <1408618663-2281-8-git-send-email-siddhesh@redhat.com> In-Reply-To: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> References: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> Replace it with IS_IN_MODULE (libc) and remove the one place that it is defined in. The generated code remains unchanged on x86_64. * include/shlib-compat.h [!NOT_IN_libc]: Remove. * nss/nss_files/files-parse.c (IS_IN_libc): Replace with IS_IN (libc). --- include/shlib-compat.h | 4 ---- nss/nss_files/files-parse.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/shlib-compat.h b/include/shlib-compat.h index 30804d3..062da8d 100644 --- a/include/shlib-compat.h +++ b/include/shlib-compat.h @@ -45,10 +45,6 @@ && (!(ABI_##lib##_##obsoleted - 0) \ || ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0)))) -# ifndef NOT_IN_libc -# define IS_IN_libc 1 -# endif - /* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to the version set name to use for e.g. symbols first introduced into libm in the GLIBC_2.1 version. Definitions of symbols with explicit diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index 1da1a6f..42fd1f3 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -73,7 +73,7 @@ struct parser_data /* Export the line parser function so it can be used in nss_db. */ # define parser_stclass /* Global */ # define parse_line CONCAT(_nss_files_parse_,ENTNAME) -# ifdef IS_IN_libc +# if IS_IN (libc) /* We are defining one of the functions that actually lives in libc because it is used to implement fget*ent and suchlike. */ # define nss_files_parse_hidden_def(name) libc_hidden_def (name)