From 91a3b2ad2e819a7fa14b8f9773856e4303a8c99a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 4 Oct 2004 09:36:51 +0000 Subject: Update. * nscd/Makefile (nscd-modules): Add gai. * nscd/gai.c: New file. --- ChangeLog | 3 +++ localedata/ChangeLog | 5 +++++ localedata/locales/gu_IN | 41 ++++++++++++++++++++--------------------- nscd/Makefile | 2 +- nscd/gai.c | 21 +++++++++++++++++++++ 5 files changed, 50 insertions(+), 22 deletions(-) create mode 100644 nscd/gai.c diff --git a/ChangeLog b/ChangeLog index c6419d6c8d..e2a2088ed7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-04 Ulrich Drepper + * nscd/Makefile (nscd-modules): Add gai. + * nscd/gai.c: New file. + * assert/assert.h: Give up on using __builtin_expect. * elf/rtld.c (dl_main): Only skip => output in ldd mode if both diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 7014099b68..065136e8d7 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2004-10-04 Ulrich Drepper + + * locales/gu_IN: Update various incorrect and missing information. + Patch by Ankit Patel . + 2004-09-28 Ulrich Drepper * locales/nb_NO: Make language field consistent in form with nn_NO. diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN index 0e0dc65e57..aaca913f2c 100644 --- a/localedata/locales/gu_IN +++ b/localedata/locales/gu_IN @@ -1,11 +1,12 @@ comment_char % escape_char / -% Gurajati language locale for India. -% Copied fron hi_IN one, G Karunakar +% Gurajati Language Locale For India. +% Copied from hi_IN one, G Karunakar % Gujarati stuff from Tapan Parikh +% Gujarati stuff Modified by Ankit Patel LC_IDENTIFICATION -title "Gujarati language locale for India" +title "Gujarati Language Locale For India" source "IndLinux.org" address "" contact "" @@ -14,8 +15,8 @@ tel "" fax "" language "Gujarati" territory "India" -revision "0.1" -date "2003-01-10" +revision "0.2" +date "2004-14-09" % category "gu_IN:2000";LC_IDENTIFICATION category "gu_IN:2000";LC_CTYPE @@ -53,7 +54,7 @@ currency_symbol "" mon_decimal_point "" mon_thousands_sep "" mon_grouping 3 -positive_sign "" +positive_sign "" negative_sign "" int_frac_digits 2 frac_digits 2 @@ -79,7 +80,7 @@ LC_TIME % Abbreviated weekday names (%a) abday "";/ "";/ - "";/ + "";/ "";/ "";/ "";/ @@ -89,7 +90,7 @@ abday "";/ % Full weekday names (%A) day "";/ "";/ - "";/ + "";/ "";/ "";/ "";/ @@ -104,7 +105,7 @@ abmon "";/ "";/ "";/ "";/ - "";/ + "";/ "";/ "";/ "" @@ -119,7 +120,7 @@ mon "";/ "";/ "";/ "";/ - "";/ + "";/ "";/ "";/ "" @@ -127,9 +128,9 @@ mon "";/ % % Equivalent of AM PM am_pm "";/ - "" + "" -% *** There arent any Devanagari characters below, so for time being +% *** There aren't any Devanagari characters below, so for time being % *** maintain same for Gujarati also, Karunakar % @@ -158,10 +159,9 @@ date_fmt "/ " END LC_TIME - LC_MESSAGES -yesexpr "" -noexpr "" +yesexpr "" +noexpr "" END LC_MESSAGES @@ -176,12 +176,11 @@ LC_NAME % name_fmt "/ " -% ***** We can have Gujarati eqv for below , Karunakar -name_gen "" -name_mr "" -name_mrs "" -name_miss "" -name_ms "" +name_gen "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" END LC_NAME diff --git a/nscd/Makefile b/nscd/Makefile index 4ccb0c2324..34186241ec 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -32,7 +32,7 @@ vpath %.c ../locale/programs nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \ getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm2_r \ dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \ - xmalloc xstrdup aicache initgrcache + xmalloc xstrdup aicache initgrcache gai ifeq ($(have-thread-library),yes) diff --git a/nscd/gai.c b/nscd/gai.c new file mode 100644 index 0000000000..2279d7176b --- /dev/null +++ b/nscd/gai.c @@ -0,0 +1,21 @@ +/* This file uses the getaddrinfo code but it compiles it without NSCD + support. We just need a few symbol renames. */ +#define __getservbyname_r getservbyname_r +#define __inet_aton inet_aton +#define __getsockname getsockname +#define __socket socket +#define __recvmsg recvmsg +#define __bind bind +#define __sendto sendto +#define __strchrnul strchrnul + +#include + +/* Support code. */ +#include +#ifdef HAVE_LIBIDN +# include +#endif + +/* Some variables normally defined in libc. */ +service_user *__nss_hosts_database; -- cgit 1.4.1