diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-10 15:35:46 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-10 15:35:46 +0000 |
commit | 2d32c4f00084f68a390e8fa4291acb49e9c0df8e (patch) | |
tree | 00964019e9307917f730b8c6b817f0cb9496a167 /libc/nss/nsswitch.c | |
parent | 7dfcd4332472afda13e2ea9c0eaba15a08d8351e (diff) | |
download | eglibc2-2d32c4f00084f68a390e8fa4291acb49e9c0df8e.tar.gz |
Merge changes between r20863 and r21108 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@21109 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nss/nsswitch.c')
-rw-r--r-- | libc/nss/nsswitch.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libc/nss/nsswitch.c b/libc/nss/nsswitch.c index 929df5422..480110d5e 100644 --- a/libc/nss/nsswitch.c +++ b/libc/nss/nsswitch.c @@ -56,8 +56,10 @@ static name_database *nss_parse_file (const char *fname) internal_function; static name_database_entry *nss_getline (char *line) internal_function; static service_user *nss_parse_service_list (const char *line) internal_function; +#if !defined DO_STATIC_NSS || defined SHARED static service_library *nss_new_service (name_database *database, const char *name) internal_function; +#endif /* Declare external database variables. */ @@ -474,7 +476,9 @@ __nss_lookup_function (service_user *ni, const char *fct_name) known_function *known = malloc (sizeof *known); if (! known) { +#if !defined DO_STATIC_NSS || defined SHARED remove_from_tree: +#endif /* Oops. We can't instantiate this node properly. Remove it from the tree. */ __tdelete (&fct_name, &ni->known.tree, &known_compare); @@ -860,6 +864,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) @@ -884,6 +889,7 @@ nss_new_service (name_database *database, const char *name) return *currentp; } +#endif #endif /* __OPTION_EGLIBC_NSSWITCH */ |