From eaf6753f8aac33a36deb98c1031d1bad7b593d2d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 2 Mar 2018 23:07:14 +0100 Subject: Fix multiple definitions of __nss_*_database (bug 22918) --- nss/nsswitch.c | 2 +- nss/nsswitch.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nss') diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 4b8deed..ee46f24 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -62,7 +62,7 @@ static service_library *nss_new_service (name_database *database, /* Declare external database variables. */ #define DEFINE_DATABASE(name) \ - extern service_user *__nss_##name##_database attribute_hidden; \ + service_user *__nss_##name##_database attribute_hidden; \ weak_extern (__nss_##name##_database) #include "databases.def" #undef DEFINE_DATABASE diff --git a/nss/nsswitch.h b/nss/nsswitch.h index eccb535..63573b9 100644 --- a/nss/nsswitch.h +++ b/nss/nsswitch.h @@ -226,10 +226,10 @@ libc_hidden_proto (__nss_hostname_digits_dots) #define MAX_NR_ADDRS 48 /* Prototypes for __nss_*_lookup2 functions. */ -#define DEFINE_DATABASE(arg) \ - service_user *__nss_##arg##_database attribute_hidden; \ - int __nss_##arg##_lookup2 (service_user **, const char *, \ - const char *, void **); \ +#define DEFINE_DATABASE(arg) \ + extern service_user *__nss_##arg##_database attribute_hidden; \ + int __nss_##arg##_lookup2 (service_user **, const char *, \ + const char *, void **); \ libc_hidden_proto (__nss_##arg##_lookup2) #include "databases.def" #undef DEFINE_DATABASE -- cgit v1.1