diff mbox

[v3] Fix build with --enable-static-nss

Message ID 20170125205317.14901-2-stilor@att.net
State New
Headers show

Commit Message

Alexey Neyman Jan. 25, 2017, 8:53 p.m. UTC 
[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 mbox

Patch

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.  */