6 files changed, 130 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index 52cb334b49..25c83be513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/iso-639.def: Some errors corrected.
+	Patch by Keld Simonsen.
+
+	* include/limits.h: Update non-gcc portion.
+	Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
+
 2000-07-22  Mark Kettenis  <kettenis@gnu.org>
 
 	* sysdeps/mach/hurd/brk.c (_hurd_set_brk): When shrinking the
diff --git a/include/limits.h b/include/limits.h
index 71222d7a67..23b4f4045a 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2000 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
@@ -92,11 +92,7 @@
 #  define INT_MAX	2147483647
 
 /* Maximum value an `unsigned int' can hold.  (Minimum is 0.)  */
-#  ifdef __STDC__
-#   define UINT_MAX	4294967295U
-#  else
-#   define UINT_MAX	4294967295
-#  endif
+#  define UINT_MAX	4294967295U
 
 /* Minimum and maximum values a `signed long int' can hold.  */
 #  ifdef __alpha__
@@ -110,13 +106,20 @@
 #  ifdef __alpha__
 #   define ULONG_MAX	18446744073709551615UL
 #  else
-#   ifdef __STDC__
-#    define ULONG_MAX	4294967295UL
-#   else
-#    define ULONG_MAX	4294967295L
-#   endif
+#   define ULONG_MAX	4294967295UL
 #  endif
 
+#  ifdef __USE_ISOC99
+
+/* Minimum and maximum values a `signed long long int' can hold.  */
+#   define LLONG_MAX	9223372036854775807LL
+#   define LLONG_MIN	(-LLONG_MAX - 1LL)
+
+/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0.)  */
+#   define ULLONG_MAX	18446744073709551615ULL
+
+#  endif /* ISO C99 */
+
 # endif	/* limits.h  */
 #endif	/* GCC 2.  */
 
diff --git a/locale/iso-639.def b/locale/iso-639.def
index 32376029df..29af160d42 100644
--- a/locale/iso-639.def
+++ b/locale/iso-639.def
@@ -2,132 +2,167 @@
  * Defines the languages codes and abbreviations according to ISO 639-[12].
  * This is used in ld-address.c (address_finish).
  *
+ * Format is: ("English name", 639-1-code, 639-2/T-code, 639-2/B-code)
  * If you find something missing or wrong contact <bug-glibc@gnu.org>
  */
+
 DEFINE_LANGUAGE_CODE ("Afar", aa, aar, aar)
 DEFINE_LANGUAGE_CODE ("Abkhazian", ab, abk, abk)
 DEFINE_LANGUAGE_CODE ("Afrikaans", af, afr, afr)
+DEFINE_LANGUAGE_CODE ("Albanian", sq, sqi, alb)
 DEFINE_LANGUAGE_CODE ("Amharic", am, amh, amh)
-DEFINE_LANGUAGE_CODE ("Arabian", ar, ara, ara)
+DEFINE_LANGUAGE_CODE ("Arabic", ar, ara, ara)
+DEFINE_LANGUAGE_CODE ("Armenian", hy, hye, arm)
 DEFINE_LANGUAGE_CODE ("Assamese", as, asm, asm)
+DEFINE_LANGUAGE_CODE ("Avestan", ae, ave, ave)
 DEFINE_LANGUAGE_CODE ("Aymara", ay, aym, aym)
-DEFINE_LANGUAGE_CODE ("Azerbajani", az, aze, aze)
+DEFINE_LANGUAGE_CODE ("Azerbaijani", az, aze, aze)
 DEFINE_LANGUAGE_CODE ("Bashkir", ba, bak, bak)
-DEFINE_LANGUAGE_CODE ("Byelorussian", be, bel, bel)
-DEFINE_LANGUAGE_CODE ("Bulgarian", bg, bul, bul)
+DEFINE_LANGUAGE_CODE ("Basque", eu, eus, baq)
+DEFINE_LANGUAGE_CODE ("Belarusian", be, bel, bel)
+DEFINE_LANGUAGE_CODE ("Bengali", bn, ben, ben)
 DEFINE_LANGUAGE_CODE ("Bihari", bh, bih, bih)
 DEFINE_LANGUAGE_CODE ("Bislama", bi, bis, bis)
-DEFINE_LANGUAGE_CODE ("Bengali", bn, ben, ben)
-DEFINE_LANGUAGE_CODE ("Tibetan", bo, bod, tib)
+DEFINE_LANGUAGE_CODE ("Bosnian", bs, bos, bos)
 DEFINE_LANGUAGE_CODE ("Breton", br, bre, bre)
+DEFINE_LANGUAGE_CODE ("Bulgarian", bg, bul, bul)
+DEFINE_LANGUAGE_CODE ("Burmese", my, mya, bur)
 DEFINE_LANGUAGE_CODE ("Catalan", ca, cat, cat)
+DEFINE_LANGUAGE_CODE ("Chamorro", ch, cha, cha)
+DEFINE_LANGUAGE_CODE ("Chechen", ce, che, che)
+DEFINE_LANGUAGE_CODE ("Chinese", zh, zho, chi)
+DEFINE_LANGUAGE_CODE ("Church Slavic", cu, chu, chu)
+DEFINE_LANGUAGE_CODE ("Chuvash", cv, chv, chv)
+DEFINE_LANGUAGE_CODE ("Cornish", kw, cor, cor)
 DEFINE_LANGUAGE_CODE ("Corsican", co, cos, cos)
 DEFINE_LANGUAGE_CODE ("Czech", cs, ces, cze)
-DEFINE_LANGUAGE_CODE ("Welsh", cy, cym, wel)
 DEFINE_LANGUAGE_CODE ("Danish", da, dan, dan)
-DEFINE_LANGUAGE_CODE ("German", de, deu, ger)
-DEFINE_LANGUAGE_CODE ("Greek", el, ell, gre)
+DEFINE_LANGUAGE_CODE ("Dutch", nl, nld, dut)
+DEFINE_LANGUAGE_CODE ("Dzongkha", dz, dzo, dzo)
 DEFINE_LANGUAGE_CODE ("English", en, eng, eng)
 DEFINE_LANGUAGE_CODE ("Esperanto", eo, epo, epo)
-DEFINE_LANGUAGE_CODE ("Spanish", es, spa, spa)
 DEFINE_LANGUAGE_CODE ("Estonian", et, est, est)
-DEFINE_LANGUAGE_CODE ("Basque", eu, eus, baq)
-DEFINE_LANGUAGE_CODE ("Persian", fa, fas, per)
-DEFINE_LANGUAGE_CODE ("Finnish", fi, fin, fin)
-DEFINE_LANGUAGE_CODE ("Fiji", fj, fij, fij)
 DEFINE_LANGUAGE_CODE ("Faroese", fo, fao, fao)
+DEFINE_LANGUAGE_CODE ("Fijian", fj, fij, fij)
+DEFINE_LANGUAGE_CODE ("Finnish", fi, fin, fin)
 DEFINE_LANGUAGE_CODE ("French", fr, fra, fre)
 DEFINE_LANGUAGE_CODE ("Frisian", fy, fry, fry)
-DEFINE_LANGUAGE_CODE ("Irish", ga, gai, iri)
-DEFINE_LANGUAGE_CODE ("Scots Gaelic", gd, gdh, gae)
+DEFINE_LANGUAGE_CODE ("Georgian", ka, kat, geo)
+DEFINE_LANGUAGE_CODE ("German", de, deu, ger)
+DEFINE_LANGUAGE_CODE ("Gaelic (Scots)", gl, gla, gla)
+DEFINE_LANGUAGE_CODE ("Irish", ga, gle, gle)
+DEFINE_LANGUAGE_CODE ("Gallegan", gl, glg, glg)
+DEFINE_LANGUAGE_CODE ("Manx", gv, glv, glv)
+DEFINE_LANGUAGE_CODE ("Greek, Modern ()", el, gre, ell)
 DEFINE_LANGUAGE_CODE ("Guarani", gn, grn, grn)
 DEFINE_LANGUAGE_CODE ("Gujarati", gu, guj, guj)
-DEFINE_LANGUAGE_CODE ("Hausa", ha, hau, hau)
+DEFINE_LANGUAGE_CODE ("Hebrew", he, heb, heb)
+DEFINE_LANGUAGE_CODE ("Herero", hz, her, her)
 DEFINE_LANGUAGE_CODE ("Hindi", hi, hin, hin)
-DEFINE_LANGUAGE_CODE ("Croatian", hr, hrv, scr)
+DEFINE_LANGUAGE_CODE ("Hiri Motu", ho, hmo, hmo)
 DEFINE_LANGUAGE_CODE ("Hungarian", hu, hun, hun)
-DEFINE_LANGUAGE_CODE ("Armenian", hy, hye, arm)
-DEFINE_LANGUAGE_CODE ("Interlingua", ia, ina, ina)
+DEFINE_LANGUAGE_CODE ("Icelandic", is, isl, ice)
+DEFINE_LANGUAGE_CODE ("Inuktitut", iu, iku, iku)
 DEFINE_LANGUAGE_CODE ("Interlingue", ie, ile, ile)
-DEFINE_LANGUAGE_CODE ("Inupiak", ik, ipk, ipk)
+DEFINE_LANGUAGE_CODE ("Interlingua", ia, ina, ina)
 DEFINE_LANGUAGE_CODE ("Indonesian", id, ind, ind)
-DEFINE_LANGUAGE_CODE ("Icelandic", is, isl, ice)
+DEFINE_LANGUAGE_CODE ("Inupiaq", ik, ipk, ipk)
 DEFINE_LANGUAGE_CODE ("Italian", it, ita, ita)
-DEFINE_LANGUAGE_CODE ("Hebrew", he, heb, heb)
+DEFINE_LANGUAGE_CODE ("Javanese", jw, jaw, jav)
 DEFINE_LANGUAGE_CODE ("Japanese", ja, jpn, jpn)
-DEFINE_LANGUAGE_CODE ("Yiddish", yi, yid, yid)
-DEFINE_LANGUAGE_CODE ("Javanese", jv, jaw, jav)
-DEFINE_LANGUAGE_CODE ("Georgian", ka, kat, geo)
-DEFINE_LANGUAGE_CODE ("Kazakh", kk, kaz, kaz)
+DEFINE_LANGUAGE_CODE ("Kalaallisut (Greenlandic)", kl, kal, kal)
 DEFINE_LANGUAGE_CODE ("Kannada", kn, kan, kan)
-DEFINE_LANGUAGE_CODE ("Korean", ko, kor, kor)
 DEFINE_LANGUAGE_CODE ("Kashmiri", ks, kas, kas)
-DEFINE_LANGUAGE_CODE ("Kurdish", ku, kur, kur)
+DEFINE_LANGUAGE_CODE ("Kazakh", kk, kaz, kaz)
+DEFINE_LANGUAGE_CODE ("Khmer", km, khm, khm)
+DEFINE_LANGUAGE_CODE ("Kikuyu", ki, kik, kik)
+DEFINE_LANGUAGE_CODE ("Kinyarwanda", rw, kin, kin)
 DEFINE_LANGUAGE_CODE ("Kirghiz", ky, kir, kir)
+DEFINE_LANGUAGE_CODE ("Komi", kv, kom, kom)
+DEFINE_LANGUAGE_CODE ("Korean", ko, kor, kor)
+DEFINE_LANGUAGE_CODE ("Kuanyama", kj, kua, kua)
+DEFINE_LANGUAGE_CODE ("Kurdish", ku, kur, kur)
+DEFINE_LANGUAGE_CODE ("Lao", lo, lao, lao)
 DEFINE_LANGUAGE_CODE ("Latin", la, lat, lat)
+DEFINE_LANGUAGE_CODE ("Latvian", lv, lav, lav)
 DEFINE_LANGUAGE_CODE ("Lingala", ln, lin, lin)
-DEFINE_LANGUAGE_CODE ("Laotian", lo, lao, lao)
 DEFINE_LANGUAGE_CODE ("Lithuanian", lt, lit, lit)
-DEFINE_LANGUAGE_CODE ("Latvian, Lettish", lv, lav, lav)
-DEFINE_LANGUAGE_CODE ("Malagasy", mg, mlg, mlg)
-DEFINE_LANGUAGE_CODE ("Maori", mi, mri, mao)
+DEFINE_LANGUAGE_CODE ("Letzeburgesch", lb, ltz, ltz)
 DEFINE_LANGUAGE_CODE ("Macedonian", mk, mkd, mac)
+DEFINE_LANGUAGE_CODE ("Marshall", mh, mah, mah)
 DEFINE_LANGUAGE_CODE ("Malayalam", ml, mal, mal)
-DEFINE_LANGUAGE_CODE ("Mongolian", mn, mon, mon)
-DEFINE_LANGUAGE_CODE ("Moldavian", mo, mol, mol)
+DEFINE_LANGUAGE_CODE ("Maori", mi, mri, mao)
 DEFINE_LANGUAGE_CODE ("Marathi", mr, mar, mar)
 DEFINE_LANGUAGE_CODE ("Malay", ms, msa, may)
+DEFINE_LANGUAGE_CODE ("Malagasy", mg, mlg, mlg)
 DEFINE_LANGUAGE_CODE ("Maltese", mt, mlt, mlt)
-DEFINE_LANGUAGE_CODE ("Burmese", my, mya, bur)
+DEFINE_LANGUAGE_CODE ("Moldavian", mo, mol, mol)
+DEFINE_LANGUAGE_CODE ("Mongolian", mn, mon, mon)
 DEFINE_LANGUAGE_CODE ("Nauru", na, nau, nau)
+DEFINE_LANGUAGE_CODE ("Navajo", nv, nav, nav)
+DEFINE_LANGUAGE_CODE ("Ndebele, South", nr, nbl, nbl)
+DEFINE_LANGUAGE_CODE ("Ndebele, North", nd, nde, nde)
+DEFINE_LANGUAGE_CODE ("Ndonga", ng, ndo, ndo)
 DEFINE_LANGUAGE_CODE ("Nepali", ne, nep, nep)
-DEFINE_LANGUAGE_CODE ("Dutch", nl, nld, dut)
 DEFINE_LANGUAGE_CODE ("Norwegian", no, nor, nor)
-DEFINE_LANGUAGE_CODE ("Occitan", oc, oci, oci)
-DEFINE_LANGUAGE_CODE ("(Afan)Oromo", om, orm, orm)
+DEFINE_LANGUAGE_CODE ("Norwegian Nynorsk", nn, nno, nno)
+DEFINE_LANGUAGE_CODE ("Norwegian Bokmċl", nn, nob, nob)
+DEFINE_LANGUAGE_CODE ("Chichewa; Nyanja", ny, nya, nya)
+DEFINE_LANGUAGE_CODE ("Occitan (post 1500); Provençal", oc, oci, oci)
 DEFINE_LANGUAGE_CODE ("Oriya", or, ori, ori)
+DEFINE_LANGUAGE_CODE ("Oromo", om, orm, orm)
+DEFINE_LANGUAGE_CODE ("Ossetian; Ossetic", os, oss, oss)
+DEFINE_LANGUAGE_CODE ("Panjabi", pa, pan, pan)
+DEFINE_LANGUAGE_CODE ("Persian", fa, fas, per)
+DEFINE_LANGUAGE_CODE ("Pali", pi, pli, pli)
 DEFINE_LANGUAGE_CODE ("Polish", pl, pol, pol)
-DEFINE_LANGUAGE_CODE ("Pashto, Pushto", ps, pus, pus)
 DEFINE_LANGUAGE_CODE ("Portuguese", pt, por, por)
+DEFINE_LANGUAGE_CODE ("Pushto", ps, pus, pus)
 DEFINE_LANGUAGE_CODE ("Quechua", qu, que, que)
-DEFINE_LANGUAGE_CODE ("Rhaeto-Romance", rm, roh, roh)
-DEFINE_LANGUAGE_CODE ("Romanian", ro, rom, rom)
+DEFINE_LANGUAGE_CODE ("Raeto-Romance", rm, roh, roh)
+DEFINE_LANGUAGE_CODE ("Romanian", ro, ron, rum)
+DEFINE_LANGUAGE_CODE ("Rundi", rn, run, run)
 DEFINE_LANGUAGE_CODE ("Russian", ru, rus, rus)
-DEFINE_LANGUAGE_CODE ("Kinyarwanda", rw, kin, kin)
+DEFINE_LANGUAGE_CODE ("Sango", sg, sag, sag)
 DEFINE_LANGUAGE_CODE ("Sanskrit", sa, san, san)
-DEFINE_LANGUAGE_CODE ("Sindhi", sd, snd, snd)
-DEFINE_LANGUAGE_CODE ("Sangho", sg, sag, sag)
-DEFINE_LANGUAGE_CODE ("Singhalese", si, sin, sin)
+DEFINE_LANGUAGE_CODE ("Serbian", sr, srp, scc)
+DEFINE_LANGUAGE_CODE ("Croatian", hr, hrv, scr)
+DEFINE_LANGUAGE_CODE ("Sinhalese", si, sin, sin)
 DEFINE_LANGUAGE_CODE ("Slovak", sk, slk, slo)
 DEFINE_LANGUAGE_CODE ("Slovenian", sl, slv, slv)
+DEFINE_LANGUAGE_CODE ("Northern Sami", se, sme, sme)
 DEFINE_LANGUAGE_CODE ("Samoan", sm, smo, smo)
 DEFINE_LANGUAGE_CODE ("Shona", sn, sna, sna)
+DEFINE_LANGUAGE_CODE ("Sindhi", sd, snd, snd)
 DEFINE_LANGUAGE_CODE ("Somali", so, som, som)
-DEFINE_LANGUAGE_CODE ("Albanian", sq, sqi, alb)
-DEFINE_LANGUAGE_CODE ("Serbian", sr, srq, scc)
-DEFINE_LANGUAGE_CODE ("Siswati", ss, ssw, ssw)
-DEFINE_LANGUAGE_CODE ("Sudanese", su, sun, sun)
+DEFINE_LANGUAGE_CODE ("Sotho, Southern", st, sot, sot)
+DEFINE_LANGUAGE_CODE ("Spanish", es, spa, spa)
+DEFINE_LANGUAGE_CODE ("Sardinian", sc, srd, srd)
+DEFINE_LANGUAGE_CODE ("Swati", ss, ssw, ssw)
+DEFINE_LANGUAGE_CODE ("Sundanese", su, sun, sun)
+DEFINE_LANGUAGE_CODE ("Swahili", sw, swa, swa)
 DEFINE_LANGUAGE_CODE ("Swedish", sv, swe, swe)
-DEFINE_LANGUAGE_CODE ("Suahili", sw, swa, swa)
+DEFINE_LANGUAGE_CODE ("Tahitian", ty, tah, tah)
 DEFINE_LANGUAGE_CODE ("Tamil", ta, tam, tam)
+DEFINE_LANGUAGE_CODE ("Tatar", tt, tat, tat)
 DEFINE_LANGUAGE_CODE ("Telugu", te, tel, tel)
 DEFINE_LANGUAGE_CODE ("Tajik", tg, tgk, tgk)
-DEFINE_LANGUAGE_CODE ("Thai", th, tha, tha)
-DEFINE_LANGUAGE_CODE ("Tigrinya", ti, tir, tir)
-DEFINE_LANGUAGE_CODE ("Turkmen", tk, tuk, tuk)
 DEFINE_LANGUAGE_CODE ("Tagalog", tl, tgl, tgl)
-DEFINE_LANGUAGE_CODE ("Tonga", to, ton, ton)
-DEFINE_LANGUAGE_CODE ("Turkish", tr, tur, tur)
+DEFINE_LANGUAGE_CODE ("Thai", th, tha, tha)
+DEFINE_LANGUAGE_CODE ("Tibetan", bo, bod, tib)
+DEFINE_LANGUAGE_CODE ("Tswana", tn, tsn, tsn)
 DEFINE_LANGUAGE_CODE ("Tsonga", ts, tso, tso)
-DEFINE_LANGUAGE_CODE ("Tatar", tt, tat, tat)
+DEFINE_LANGUAGE_CODE ("Turkmen", tk, tuk, tuk)
 DEFINE_LANGUAGE_CODE ("Twi", tw, twi, twi)
+DEFINE_LANGUAGE_CODE ("Uighur", ug, uig, uig)
 DEFINE_LANGUAGE_CODE ("Ukrainian", uk, ukr, ukr)
 DEFINE_LANGUAGE_CODE ("Urdu", ur, urd, urd)
 DEFINE_LANGUAGE_CODE ("Uzbek", uz, uzb, uzb)
 DEFINE_LANGUAGE_CODE ("Vietnamese", vi, vie, vie)
 DEFINE_LANGUAGE_CODE ("Volapük", vo, vol, vol)
+DEFINE_LANGUAGE_CODE ("Welsh", cy, cym, wel)
 DEFINE_LANGUAGE_CODE ("Wolof", wo, wol, wol)
 DEFINE_LANGUAGE_CODE ("Xhosa", xh, xho, xho)
-DEFINE_LANGUAGE_CODE ("Yoruba", yo, yor, yor)
-DEFINE_LANGUAGE_CODE ("Chinese", zh, zho, chi)
+DEFINE_LANGUAGE_CODE ("Yiddish", yi, yid, yid)
+DEFINE_LANGUAGE_CODE ("Zhuang", za, zha, zha)
 DEFINE_LANGUAGE_CODE ("Zulu", zu, zul, zul)
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f4815b9970..b931ed5ca5 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/sr_YU (yesexpr): Fix "*." -> ".*".
+	(enoexpr): Likewise.
+	* locales/hr_HR: Likewise.
+	Patches by GOTO Masanori <gotom@debian.or.jp>.
+
+	* locales/i18n (yesexpr): Add U005E at the beginning.
+	(noexpr): Likewise.
+
 2000-07-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/ja_JP (yesexpr): U0060 should be U005E.
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index 252383f45a..9d8e5335d4 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -2141,8 +2141,8 @@ copy "i18n"
 END LC_CTYPE
 
 LC_MESSAGES
-yesexpr "<U005E><U005B><U0064><U0044><U0079><U0059><U005D><U002A><U002E>"
-noexpr  "<U005E><U005B><U006E><U004E><U005D><U002A><U002E>"
+yesexpr "<U005E><U005B><U0064><U0044><U0079><U0059><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY
diff --git a/localedata/locales/sr_YU b/localedata/locales/sr_YU
index ca795ccae9..f00d81b722 100644
--- a/localedata/locales/sr_YU
+++ b/localedata/locales/sr_YU
@@ -2141,8 +2141,8 @@ copy "i18n"
 END LC_CTYPE
 
 LC_MESSAGES
-yesexpr "<U005B><U0064><U0044><U0079><U0059><U0031><U005D><U002A><U002E>"
-noexpr  "<U005B><U006E><U004E><U0030><U005D><U002A><U002E>"
+yesexpr "<U005B><U0064><U0044><U0079><U0059><U0031><U005D><U002E><U002A>"
+noexpr  "<U005B><U006E><U004E><U0030><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_MONETARY