diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-12-10 16:39:54 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-12-10 16:39:54 +0000 |
| commit | 0f1e140e796f55cf5f07d39707f3e88d335f4ff1 (patch) | |
| tree | e44d49e4cb8da17389d4ffa57e784f7ee91d3381 /libc/locale | |
| parent | 8acd6170c246b159d26f05d85fa256746391d3d7 (diff) | |
Merge changes between r7357 and r7510 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@7511 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale')
| -rw-r--r-- | libc/locale/iso-639.def | 4 | ||||
| -rw-r--r-- | libc/locale/programs/ld-address.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libc/locale/iso-639.def b/libc/locale/iso-639.def index 68a4c5ed3..6d88767c8 100644 --- a/libc/locale/iso-639.def +++ b/libc/locale/iso-639.def @@ -1,8 +1,9 @@ /* - * Defines the languages codes and abbreviations according to ISO 639-[12]. + * Defines the languages codes and abbreviations according to ISO 639-[123]. * This is used in ld-address.c (address_finish). * * Format is: ("English name", 639-1-code, 639-2/T-code, 639-2/B-code) + * For some languages which have no 639-2 code the 639-3 code is used. * If you find something missing or wrong, please go to the URL * http://www.gnu.org/software/libc/bugs.html and follow * instructions there to file a bug report. @@ -89,6 +90,7 @@ DEFINE_LANGUAGE_CODE ("Chamorro", ch, cha, cha) DEFINE_LANGUAGE_CODE ("Chechen", ce, che, che) DEFINE_LANGUAGE_CODE3 ("Cherokee", chr, chr) DEFINE_LANGUAGE_CODE3 ("Cheyenne", chy, chy) +DEFINE_LANGUAGE_CODE2 ("Chhattisgarhi", hne) /* ISO 639-3 */ DEFINE_LANGUAGE_CODE3 ("Chibcha", chb, chb) DEFINE_LANGUAGE_CODE ("Chichewa; Chewa; Nyanja", ny, nya, nya) DEFINE_LANGUAGE_CODE ("Chinese", zh, zho, chi) diff --git a/libc/locale/programs/ld-address.c b/libc/locale/programs/ld-address.c index 40149fde1..6dc977d6d 100644 --- a/libc/locale/programs/ld-address.c +++ b/libc/locale/programs/ld-address.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2002, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998-2002, 2005, 2006, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -57,6 +57,8 @@ static struct { #Ab, #Term, #Lib }, #define DEFINE_LANGUAGE_CODE3(Name, Term, Lib) \ { "", #Term, #Lib }, +#define DEFINE_LANGUAGE_CODE2(Name, Term) \ + { "", #Term, "" }, #include "iso-639.def" }; |