From 0d655550deaaf5813c0b198bbc581164e80230d8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 12 Jul 2000 20:39:58 +0000 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++++ linuxthreads/ChangeLog | 4 ++++ localedata/ChangeLog | 24 ++++++++++++++++++++++++ resolv/Versions | 2 +- wcsmbs/wcsmbsload.c | 4 ++-- 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3d9d900ba..af77b4c018 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +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. + 2000-07-12 Bruno Haible * iconv/gconv_open.c (__gconv_open): Merge duplicated code. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 10639f79c4..8bd9c75cdc 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2000-07-12 Bruno Haible + + * Examples/ex8.c: Include , not . + 2000-07-12 Ulrich Drepper * spinlock.c: Fix code for TEST_FOR_COMPARE_AND_SWAP being defined. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 1c15fa1b07..57c2f34343 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,27 @@ +2000-07-11 Andreas Jaeger + + * Makefile (locale_test_suite): Always run test suite. + ($(addprefix $(objpfx),$(CTYPE_FILES))): Add extra parameter for + gen-locale.sh. + (do-collate-test): Likewise. + (do-tst-fmon): Likewise. + (do-tst-locale): Likewise. + (do-tst-rpmatch): Likewise. + (do-tst-trans): Likewise. + (do-tst-mbswcs): Likewise. + (do-tst-ctype): Likewise. + + * sort-test.sh : Rewrite to work with static only builds. + * tst-ctype.sh: Likewise. + * tst-fmon.sh: Likewise. + * tst-locale.sh: Likewise. + * tst-mbswcs.sh: Likewise. + * tst-rpmatch.sh: Likewise. + * tst-trans.sh: Likewise. + + * gen-locale.sh (locfile): Fix it for building with + sourcedir==builddir and for static only builds. + 2000-07-07 Ulrich Drepper * locales/POSIX: Remove repertoire map reference. diff --git a/resolv/Versions b/resolv/Versions index 3448c9281b..98fa762a75 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -52,7 +52,7 @@ libresolv { } GLIBC_2.2 { __res_nmkquery; __res_nquery; __res_nquerydomain; __res_nsearch; - __ns_get16; + __ns_get16; __res_hostalias; } libnss_dns { 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