Fix build error when disable nscd.

Message ID 20210713125040.28088-1-cooper.qu@linux.alibaba.com
State Committed
Commit 135425a1dd50cbe2b9db0628d6c2b36c7889f30b
Headers
Series Fix build error when disable nscd. |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

瞿仙淼 July 13, 2021, 12:50 p.m. UTC
  The error is as follows:
nss_module.c: In function 'module_load_nss_files':
nss_module.c:117:7: error: 'is_nscd' undeclared (first use in this function)
  117 |   if (is_nscd)
      |       ^~~~~~~
nss_module.c:117:7: note: each undeclared identifier is reported only once for each function it appears in
nss_module.c:119:51: error: 'nscd_init_cb' undeclared (first use in this function); did you mean 'nscd_init'?
  119 |       void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
      |                                                   ^~~~~~~~~~~~
      |                                                   nscd_init
---
 nss/nss_module.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Florian Weimer July 14, 2021, 9:36 a.m. UTC | #1
* Cooper Qu via Libc-alpha:

> The error is as follows:
> nss_module.c: In function 'module_load_nss_files':
> nss_module.c:117:7: error: 'is_nscd' undeclared (first use in this function)
>   117 |   if (is_nscd)
>       |       ^~~~~~~
> nss_module.c:117:7: note: each undeclared identifier is reported only once for each function it appears in
> nss_module.c:119:51: error: 'nscd_init_cb' undeclared (first use in this function); did you mean 'nscd_init'?
>   119 |       void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
>       |                                                   ^~~~~~~~~~~~
>       |                                                   nscd_init

Thanks.  I've applied this for you with minimal changes.

Florian
  

Patch

diff --git a/nss/nss_module.c b/nss/nss_module.c
index 7b42c585a4..b42f37953c 100644
--- a/nss/nss_module.c
+++ b/nss/nss_module.c
@@ -114,6 +114,7 @@  static const function_name nss_function_name_array[] =
 static bool
 module_load_nss_files (struct nss_module *module)
 {
+# ifdef USE_NSCD
   if (is_nscd)
     {
       void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
@@ -122,6 +123,7 @@  module_load_nss_files (struct nss_module *module)
 #  endif
       _nss_files_init (cb);
     }
+#endif
 
   /* Initialize the function pointers, following the double-checked
      locking idiom.  */