aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nss/nsswitch.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2771e4bad6..48f7515c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-28 Roland McGrath <roland@hack.frob.com>
+
+ * nss/nsswitch.c (nss_new_service): Conditionalize definition on
+ [!DO_STATIC_NSS || SHARED], matching its only caller.
+
2012-09-28 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/fpu/libm-test-ulps: Update.
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 750cd02ab0..1379553abe 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -786,6 +786,7 @@ nss_getline (char *line)
}
+#if !defined DO_STATIC_NSS || defined SHARED
static service_library *
internal_function
nss_new_service (name_database *database, const char *name)
@@ -810,6 +811,7 @@ nss_new_service (name_database *database, const char *name)
return *currentp;
}
+#endif
#if defined SHARED && defined USE_NSCD