From 0d655550deaaf5813c0b198bbc581164e80230d8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 12 Jul 2000 20:39:58 +0000 Subject: Update. 2000-07-12 H.J. Lu * resolv/Versions (libresolv): Add __res_hostalias to GLIBC_2.2 for _nss_dns_gethostbyname2_r in resolv/nss_dns/dns-host.c. 2000-07-12 Ulrich Drepper * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Shut gcc up although it is wrong. --- wcsmbs/wcsmbsload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index b152b3541c..51c7ef5051 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -182,8 +182,8 @@ __wcsmbs_load_conv (const struct locale_data *new_category) since the internal character set is supposed to be able to represent all others. */ new_towc = getfct ("INTERNAL", complete_name); - if (new_towc != NULL) - new_tomb = getfct (complete_name, "INTERNAL"); + new_tomb = (new_towc != NULL + ? getfct (complete_name, "INTERNAL") : NULL); /* If any of the conversion functions is not available we don't use any since this would mean we cannot convert back and -- cgit 1.4.1