summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-12 20:39:58 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-12 20:39:58 +0000
commit0d655550deaaf5813c0b198bbc581164e80230d8 (patch)
tree6325e2ae78cd0727d9180dbd3227739cad9fd218 /wcsmbs
parent9f835f5fb48eb6e173a7ca3c678595dba28c5e7a (diff)
downloadglibc-0d655550deaaf5813c0b198bbc581164e80230d8.tar.gz
glibc-0d655550deaaf5813c0b198bbc581164e80230d8.tar.xz
glibc-0d655550deaaf5813c0b198bbc581164e80230d8.zip
Update.
2000-07-12  H.J. Lu  <hjl@gnu.org>

	* 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  <drepper@redhat.com>

	* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Shut gcc up although
	it is wrong.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wcsmbsload.c4
1 files changed, 2 insertions, 2 deletions
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