Message ID | 15ec782e-a0ec-8569-7ba5-79586b8e6879@att.net |
---|---|
State | New |
Headers | show |
Ping #3... On 02/07/2017 11:49 AM, Alexey Neyman wrote: > 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 <stilor@att.net> >>> --- >>> 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 <stilor@att.net> >>> + >>> + [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 <fweimer@redhat.com> >>> * 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. */ >> >
Ping #4 On 02/28/2017 11:01 PM, Alexey Neyman wrote: > Ping #3... > > > On 02/07/2017 11:49 AM, Alexey Neyman wrote: >> 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 <stilor@att.net> >>>> --- >>>> 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 <stilor@att.net> >>>> + >>>> + [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 <fweimer@redhat.com> >>>> * 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 <stilor@att.net> 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 <stilor@att.net> --- 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 <stilor@att.net> + + [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 <joseph@codesourcery.com> [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