From patchwork Tue Feb 7 19:49:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Neyman X-Patchwork-Id: 19158 Received: (qmail 54652 invoked by alias); 7 Feb 2017 19:50:08 -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 54632 invoked by uid 89); 7 Feb 2017 19:50:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, URIBL_RED autolearn=ham version=3.3.2 spammy=Hx-languages-length:2805 X-HELO: nm3-vm3.access.bullet.mail.bf1.yahoo.com X-Yahoo-SMTP: 0h0Q7euswBD_g.kcEqbzJWRFfrba801gq1M1 Subject: Re: [PATCH v3] Fix build with --enable-static-nss To: libc-alpha@sourceware.org References: <3be10403-39c2-b4f3-f482-187280726a2e@linaro.org> <20170125205457.15003-1-stilor@att.net> Cc: adhemerval.zanella@linaro.org From: Alexey Neyman Message-ID: <15ec782e-a0ec-8569-7ba5-79586b8e6879@att.net> Date: Tue, 7 Feb 2017 11:49:54 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: With 2.25 released, can this patch be picked up now? Regards, Alexey. On 02/04/2017 12:26 PM, Alexey Neyman wrote: > Ping? > > Regards, > Alexey. > > On 01/25/2017 12:54 PM, Alexey Neyman wrote: >> [BZ #21088] >> * nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around >> definitions >> match those around use, to avoid "defined but not used" error. >> >> Signed-off-by: Alexey Neyman >> --- >> ChangeLog | 6 ++++++ >> nss/nsswitch.c | 2 +- >> 2 files changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/ChangeLog b/ChangeLog >> index ce6f057..642a228 100644 >> --- a/ChangeLog >> +++ b/ChangeLog >> @@ -1,3 +1,9 @@ >> +2017-01-24 Alexey Neyman >> + >> + [BZ #21088] >> + * nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around >> definitions >> + match those around use, to avoid "defined but not used" error. >> + >> 2017-01-25 Florian Weimer >> * string/Makefile (xtests): Add comment. >> diff --git a/nss/nsswitch.c b/nss/nsswitch.c >> index 0a65f6a..8f31658 100644 >> --- a/nss/nsswitch.c >> +++ b/nss/nsswitch.c >> @@ -94,7 +94,7 @@ static name_database *service_table; >> static name_database_entry *defconfig_entries; >> -#ifdef USE_NSCD >> +#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED) >> /* Nonzero if this is the nscd process. */ >> static bool is_nscd; >> /* The callback passed to the init functions when nscd is used. */ > From b8a83a07a004cf771fd80253849d8a24935e5514 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 24 Jan 2017 10:31:40 -0800 Subject: [PATCH v3] Fix build with --enable-static-nss [BZ #21088] * nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions match those around use, to avoid "defined but not used" error. Signed-off-by: Alexey Neyman --- ChangeLog | 6 ++++++ nss/nsswitch.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 037552d..3243c47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-01-24 Alexey Neyman + + [BZ #21088] + * nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions + match those around use, to avoid "defined but not used" error. + 2017-02-07 Joseph Myers [BZ #21112] diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 0a65f6a..8f31658 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -94,7 +94,7 @@ static name_database *service_table; static name_database_entry *defconfig_entries; -#ifdef USE_NSCD +#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED) /* Nonzero if this is the nscd process. */ static bool is_nscd; /* The callback passed to the init functions when nscd is used. */ -- 2.9.3