diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-10-30 16:11:14 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-10-30 16:11:14 +0100 |
| commit | 017dd87448e913383a8be5773569f218e8c661c5 (patch) | |
| tree | d9124fdbb290416e60553c87aa9f9f1750d7acb8 /locale | |
| parent | f8e81cec78280ef92014305c1e10a808b1260683 (diff) | |
| parent | 3a83202db6e5591f2b72974c1ad98602c6620770 (diff) | |
| download | glibc-017dd87448e913383a8be5773569f218e8c661c5.tar.gz glibc-017dd87448e913383a8be5773569f218e8c661c5.tar.xz glibc-017dd87448e913383a8be5773569f218e8c661c5.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/iso-639.def | 1 | ||||
| -rw-r--r-- | locale/programs/locale-spec.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/locale/iso-639.def b/locale/iso-639.def index de78aa1c0d..bb12d82692 100644 --- a/locale/iso-639.def +++ b/locale/iso-639.def @@ -84,6 +84,7 @@ DEFINE_LANGUAGE_CODE3 ("Caucasian (Other)", cau, cau) DEFINE_LANGUAGE_CODE3 ("Cebuano", ceb, ceb) DEFINE_LANGUAGE_CODE3 ("Celtic (Other)", cel, cel) DEFINE_LANGUAGE_CODE3 ("Central American Indian (Other)", cai, cai) +DEFINE_LANGUAGE_CODE3 ("Central Sama", sml, sml) DEFINE_LANGUAGE_CODE3 ("Chagatai", chg, chg) DEFINE_LANGUAGE_CODE3 ("Chamic languages", cmc, cmc) DEFINE_LANGUAGE_CODE ("Chamorro", ch, cha, cha) diff --git a/locale/programs/locale-spec.c b/locale/programs/locale-spec.c index 63a7a32e05..43df46bb38 100644 --- a/locale/programs/locale-spec.c +++ b/locale/programs/locale-spec.c @@ -21,6 +21,8 @@ # include <config.h> #endif +#include <error.h> +#include <libintl.h> #include <stdio.h> #include <string.h> #include <wchar.h> |