diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/iso-3166.def | 5 | ||||
| -rw-r--r-- | locale/iso-4217.def | 2 | ||||
| -rw-r--r-- | locale/locale.h | 6 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 8 |
4 files changed, 12 insertions, 9 deletions
diff --git a/locale/iso-3166.def b/locale/iso-3166.def index bae42caed2..a9e1422cba 100644 --- a/locale/iso-3166.def +++ b/locale/iso-3166.def @@ -96,6 +96,7 @@ DEFINE_COUNTRY_CODE ("GRENADA", GD, GRD, 308) DEFINE_COUNTRY_CODE ("GUADELOUPE", GP, GLP, 312) DEFINE_COUNTRY_CODE ("GUAM", GU, GUM, 316) DEFINE_COUNTRY_CODE ("GUATEMALA", GT, GTM, 320) +DEFINE_COUNTRY_CODE ("GUERNSEY", GG, GGY, 831) DEFINE_COUNTRY_CODE ("GUINEA", GN, GIN, 324) DEFINE_COUNTRY_CODE ("GUINEA-BISSAU", GW, GNB, 624) DEFINE_COUNTRY_CODE ("GUYANA", GY, GUY, 328) @@ -111,10 +112,12 @@ DEFINE_COUNTRY_CODE ("INDONESIA", ID, IDN, 360) DEFINE_COUNTRY_CODE ("IRAN, ISLAMIC REPUBLIC OF", IR, IRN, 364) DEFINE_COUNTRY_CODE ("IRAQ", IQ, IRQ, 368) DEFINE_COUNTRY_CODE ("IRELAND", IE, IRL, 372) +DEFINE_COUNTRY_CODE ("ISLE OF MAN", IM, IMN, 833) DEFINE_COUNTRY_CODE ("ISRAEL", IL, ISR, 376) DEFINE_COUNTRY_CODE ("ITALY", IT, ITA, 380) DEFINE_COUNTRY_CODE ("JAMAICA", JM, JAM, 388) DEFINE_COUNTRY_CODE ("JAPAN", JP, JPN, 392) +DEFINE_COUNTRY_CODE ("JERSEY", JE, JEY, 832) DEFINE_COUNTRY_CODE ("JORDAN", JO, JOR, 400) DEFINE_COUNTRY_CODE ("KAZAKSTAN", KZ, KAZ, 398) DEFINE_COUNTRY_CODE ("KENYA", KE, KEN, 404) @@ -197,7 +200,7 @@ DEFINE_COUNTRY_CODE ("SAN MARINO", SM, SMR, 674) DEFINE_COUNTRY_CODE ("SAO TOME AND PRINCIPE", ST, STP, 678) DEFINE_COUNTRY_CODE ("SAUDI ARABIA", SA, SAU, 682) DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686) -DEFINE_COUNTRY_CODE ("SERBIA AND MONTENEGRO", CS, SCG, 891) +DEFINE_COUNTRY_CODE ("SERBIA", RS, SRB, 688) DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690) DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694) DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702) diff --git a/locale/iso-4217.def b/locale/iso-4217.def index a40813271a..6d4ecb344c 100644 --- a/locale/iso-4217.def +++ b/locale/iso-4217.def @@ -43,7 +43,6 @@ DEFINE_INT_CURR("CLP") /* Chilean Peso */ DEFINE_INT_CURR("CNY") /* China Yuan Renminbi */ DEFINE_INT_CURR("COP") /* Colombian Peso */ DEFINE_INT_CURR("CRC") /* Costa Rican Colon */ -DEFINE_INT_CURR("CSD") /* Serbian Dinar */ DEFINE_INT_CURR("CUP") /* Cuban Peso */ DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */ DEFINE_INT_CURR("CYP") /* Cypriot Pound */ @@ -142,6 +141,7 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ DEFINE_INT_CURR("RON") /* Romanian New Leu */ +DEFINE_INT_CURR("RSD") /* Serbian Dinars */ DEFINE_INT_CURR("RUB") /* Russian Ruble */ DEFINE_INT_CURR("RWF") /* Rwanda Franc */ DEFINE_INT_CURR("SAR") /* Saudi Arabia Riyal */ diff --git a/locale/locale.h b/locale/locale.h index 1b0296ae4a..08fc531d7e 100644 --- a/locale/locale.h +++ b/locale/locale.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,95-99,2000,01,02 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1995-2002,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -48,6 +48,8 @@ __BEGIN_DECLS #define LC_IDENTIFICATION __LC_IDENTIFICATION +__BEGIN_NAMESPACE_STD + /* Structure giving information about numeric and monetary notation. */ struct lconv { @@ -119,8 +121,6 @@ struct lconv }; -__BEGIN_NAMESPACE_STD - /* Set and/or return the current locale. */ extern char *setlocale (int __category, __const char *__locale) __THROW; diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index af47279958..a4f491cd28 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2002, 2003, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1995-2003, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -1330,8 +1330,9 @@ order for `%.*s' already defined at %s:%Zu"), uint32_t wc; int cnt; - /* Generate the the name. */ - sprintf (buf + preflen, base == 10 ? "%ld" : "%lX", from); + /* Generate the name. */ + sprintf (buf + preflen, base == 10 ? "%0*ld" : "%0*lX", + (int) (lenfrom - preflen), from); /* Look whether this name is already defined. */ void *ptr; @@ -3571,7 +3572,6 @@ error while adding equivalent collating symbol")); if (was_ellipsis != tok_none) { - handle_ellipsis (ldfile, symstr, symlen, was_ellipsis, charmap, repertoire, result); |